4 files changed, 15 insertions, 22 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index ab36d217e..519958096 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.06
 PKG_RELEASE:=		1
+PKG_HASH:=		b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
 PKG_DESCR:=		multiboot boot loader
 PKG_SECTION:=		base/boot
 PKG_BUILDDEP:=		bison-host grub-host
-HOST_BUILDDEP:=		python2-host
+HOST_BUILDDEP:=		python3-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/files/grub-dual.cfg b/package/grub/files/grub-dual.cfg
index bae2fa414..46b5451ad 100644
--- a/package/grub/files/grub-dual.cfg
+++ b/package/grub/files/grub-dual.cfg
@@ -40,11 +40,15 @@ function savedefault {
 }
 
 menuentry "OpenADK1" {
-  set root=(hd0,2)
-  linux (hd0,2)/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5
+  insmod part_gpt
+  insmod ext2
+  set root=(hd0,gpt2)
+  linux (hd0,2)/boot/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5
 }
 menuentry "OpenADK2" {
-  set root=(hd0,3)
-  linux (hd0,3)/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5
+  insmod part_gpt
+  insmod ext2
+  set root=(hd0,gpt3)
+  linux (hd0,3)/boot/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5
 }
 
diff --git a/package/grub/files/grub.cfg b/package/grub/files/grub.cfg
index 8d20ab243..3fdc48eda 100644
--- a/package/grub/files/grub.cfg
+++ b/package/grub/files/grub.cfg
@@ -6,9 +6,9 @@ set default=0
 set timeout=3
 
 menuentry "OpenADK" {
-  insmod part_msdos
+  insmod part_gpt
   insmod ext2
-  set root='hd0,msdos1'
+  set root='hd0,gpt2'
   echo "Loading OpenADK"
-  linux16 /boot/kernel root=/dev/sda1 rootfstype=ext4 rootwait panic=10
+  linux /boot/kernel root=/dev/sda2 rootfstype=ext4 rootwait panic=10
 }
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 1c2fde022..000000000
--- 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
-