Waldemar Brodkorb 1 год назад
Родитель
Сommit
af8df326d9

+ 6 - 2
package/grub/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		grub
-PKG_VERSION:=		2.06
+PKG_VERSION:=		2.12
 PKG_RELEASE:=		1
-PKG_HASH:=		b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
+PKG_HASH:=		f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa
 PKG_DESCR:=		multiboot boot loader
 PKG_SECTION:=		base/boot
 PKG_BUILDDEP:=		bison-host grub-host
@@ -93,8 +93,12 @@ endif
 ifeq ($(ADK_TARGET_DUAL_BOOT),y)
 GRUB_CFG=		grub-dual.cfg
 else
+ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y)
+GRUB_CFG=		grub-pc-vga.cfg
+else
 GRUB_CFG=		grub.cfg
 endif
+endif
 
 HOST_CONFIGURE_ARGS+=	--enable-efiemu=no \
 			--disable-grub-mkfont \

+ 10 - 0
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 root=/dev/sda1 rootfstype=ext4 rootwait panic=10
+}

+ 1 - 0
package/grub/src/grub-core/extra_deps.lst

@@ -0,0 +1 @@
+depends bli part_gpt

+ 1 - 0
target/x86_64/qemu-x86_64/genimage.cfg

@@ -8,6 +8,7 @@ image disk.img {
     image = "boot.img"
     offset = 0
     size = 512
+    holes = {"(440; 512)"}
   }
 
   partition grub {