7 files changed, 59 insertions, 28 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index ab36d217e..3d7f8d868 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.12
 PKG_RELEASE:=		1
+PKG_HASH:=		f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa
 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
@@ -67,6 +66,11 @@ GRUB_PREFIX=		(hd0,msdos1)/boot/grub
 GRUB_TARGET=		i386
 GRUB_PLATFORM=		pc
 GRUB_MODULES=		boot linux ext2 fat part_msdos part_gpt normal biosdisk
+ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y)
+GRUB_CFG=		grub-pc-vga.cfg
+else
+GRUB_CFG=		grub-pc-serial.cfg
+endif
 endif
 
 ifeq ($(ADK_PACKAGE_GRUB_EFI_X86),y)
@@ -78,6 +82,11 @@ GRUB_PREFIX=		/EFI/BOOT
 GRUB_TARGET=		i386
 GRUB_PLATFORM=		efi
 GRUB_MODULES=		boot linux ext2 fat part_msdos part_gpt normal efi_gop
+ifeq ($(ADK_TARGET_DUAL_BOOT),y)
+GRUB_CFG=		grub-efi-serial-dual.cfg
+else
+GRUB_CFG=		grub-efi-serial.cfg
+endif
 endif
 
 ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y)
@@ -89,12 +98,11 @@ GRUB_PREFIX=		/EFI/BOOT
 GRUB_TARGET=		x86_64
 GRUB_PLATFORM=		efi
 GRUB_MODULES=		boot linux ext2 fat part_msdos part_gpt normal efi_gop
-endif
-
 ifeq ($(ADK_TARGET_DUAL_BOOT),y)
-GRUB_CFG=		grub-dual.cfg
+GRUB_CFG=		grub-efi-dual-serial.cfg
 else
-GRUB_CFG=		grub.cfg
+GRUB_CFG=		grub-efi-serial.cfg
+endif
 endif
 
 HOST_CONFIGURE_ARGS+=	--enable-efiemu=no \
diff --git a/package/grub/files/grub-dual.cfg b/package/grub/files/grub-efi-dual-serial.cfg
index bae2fa414..fde844e09 100644
--- a/package/grub/files/grub-dual.cfg
+++ b/package/grub/files/grub-efi-dual-serial.cfg
@@ -1,13 +1,17 @@
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input serial
+terminal_output serial
+
 if [ "x\${timeout}" != "x-1" ]; then
   if keystatus; then
     if keystatus --shift; then
       set timeout=-1
     else
-      set timeout=0
+      set timeout=2
     fi
   else
     if sleep --interruptible 2; then
-      set timeout=0
+      set timeout=2
     fi
   fi
 fi
@@ -40,11 +44,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-efi-serial.cfg
index 8d20ab243..3fdc48eda 100644
--- a/package/grub/files/grub.cfg
+++ b/package/grub/files/grub-efi-serial.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/files/grub-pc-serial.cfg b/package/grub/files/grub-pc-serial.cfg
new file mode 100644
index 000000000..d48b82c45
--- /dev/null
+++ b/package/grub/files/grub-pc-serial.cfg
@@ -0,0 +1,14 @@
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input serial
+terminal_output serial
+
+set default=0
+set timeout=3
+
+menuentry "OpenADK" {
+  insmod msdospart
+  insmod ext2
+  set root='hd0,1'
+  echo "Loading OpenADK"
+  linux /boot/kernel rootfstype=ext4 rootwait panic=10
+}
diff --git a/package/grub/files/grub-pc-vga.cfg b/package/grub/files/grub-pc-vga.cfg
new file mode 100644
index 000000000..8200624d6
--- /dev/null
+++ b/package/grub/files/grub-pc-vga.cfg
@@ -0,0 +1,10 @@
+set default=0
+set timeout=3
+
+menuentry "OpenADK" {
+  insmod msdospart
+  insmod ext2
+  set root='hd0,1'
+  echo "Loading OpenADK"
+  linux /boot/kernel console=tty0 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
- 
diff --git a/package/grub/src/grub-core/extra_deps.lst b/package/grub/src/grub-core/extra_deps.lst
new file mode 100644
index 000000000..f44ad6a0c
--- /dev/null
+++ b/package/grub/src/grub-core/extra_deps.lst
@@ -0,0 +1 @@
+depends bli part_gpt