diff options
Diffstat (limited to 'package/grub')
-rw-r--r-- | package/grub/Makefile | 23 | ||||
-rw-r--r-- | package/grub/files/grub-efi-dual-serial.cfg (renamed from package/grub/files/grub-dual.cfg) | 20 | ||||
-rw-r--r-- | package/grub/files/grub-efi-serial.cfg (renamed from package/grub/files/grub.cfg) | 6 | ||||
-rw-r--r-- | package/grub/files/grub-pc-serial.cfg | 14 | ||||
-rw-r--r-- | package/grub/files/grub-pc-vga.cfg | 10 | ||||
-rw-r--r-- | package/grub/src/grub-core/extra_deps.lst | 1 |
6 files changed, 58 insertions, 16 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile index b36d9f788..3d7f8d868 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -4,13 +4,13 @@ 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 -HOST_BUILDDEP:= python2-host +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= https://ftp.gnu.org/gnu/grub/ PKG_NOPARALLEL:= 1 @@ -66,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) @@ -77,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) @@ -88,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/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 |