diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/grub/Makefile | 8 | ||||
| -rw-r--r-- | package/grub/files/grub-pc-vga.cfg | 10 | ||||
| -rw-r--r-- | package/grub/src/grub-core/extra_deps.lst | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile index 519958096..d37472b8c 100644 --- a/package/grub/Makefile +++ b/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 \ diff --git a/package/grub/files/grub-pc-vga.cfg b/package/grub/files/grub-pc-vga.cfg new file mode 100644 index 000000000..b0259ddb3 --- /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 root=/dev/sda1 rootfstype=ext4 rootwait panic=10 +} 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 |