summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2020-10-14 08:52:34 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2020-10-14 08:52:34 (GMT)
commitdc44cd46548c493da797af916e8bd285865989da (patch)
tree23b0b6fba2c58194352ba90d77d9de4654ec934e /package
parent4675228299dcd13e9a086fedd22fb6085d098350 (diff)
grub: update to 2.04
Diffstat (limited to 'package')
-rw-r--r--package/grub/Makefile7
-rw-r--r--package/grub/patches/patch-grub-core_Makefile_am10
2 files changed, 3 insertions, 14 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index ab36d21..8a7a6b3 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -4,14 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= grub
-PKG_VERSION:= 07662af7aed55bcec448bc2a6610de1f0cb62100
+PKG_VERSION:= 2.04
PKG_RELEASE:= 1
+PKG_HASH:= e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d
PKG_DESCR:= multiboot boot loader
PKG_SECTION:= base/boot
PKG_BUILDDEP:= bison-host grub-host
HOST_BUILDDEP:= python2-host
PKG_URL:= http://www.gnu.org/software/grub
-PKG_SITES:= https://git.savannah.gnu.org/git/grub.git
+PKG_SITES:= https://ftp.gnu.org/gnu/grub/
PKG_NOPARALLEL:= 1
PKG_ARCH_DEPENDS:= x86 x86_64 mips mips64 ppc ppc64
@@ -36,8 +37,6 @@ $(eval $(call PKG_template,GRUB_TOOLS,grub-tools,$(PKG_VERSION)-${PKG_RELEASE},$
TARGET_CFLAGS:=$(filter-out -fstack-protector-all,$(TARGET_CFLAGS))
TARGET_CFLAGS:=$(filter-out -flto,$(TARGET_CFLAGS))
-AUTOTOOL_STYLE:= autogen
-
ifeq ($(ADK_PACKAGE_GRUB_ARC),y)
GRUB_ARCH= mips-arc
GRUB_IMAGE= grub.img
diff --git a/package/grub/patches/patch-grub-core_Makefile_am b/package/grub/patches/patch-grub-core_Makefile_am
deleted file mode 100644
index 1c2fde0..0000000
--- a/package/grub/patches/patch-grub-core_Makefile_am
+++ /dev/null
@@ -1,10 +0,0 @@
---- grub-07662af7aed55bcec448bc2a6610de1f0cb62100.orig/grub-core/Makefile.am 2017-02-12 20:56:32.000000000 +0100
-+++ grub-07662af7aed55bcec448bc2a6610de1f0cb62100/grub-core/Makefile.am 2017-03-28 08:00:46.000000000 +0200
-@@ -61,6 +61,7 @@ grub_script.yy.c: grub_script.yy.h
-
- rs_decoder.h: $(srcdir)/lib/reed_solomon.c
- $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
-+ sed -i -e "s#.*macosx_version_min.*##" $@
-
- CLEANFILES += grub_script.yy.c grub_script.yy.h
-