summaryrefslogtreecommitdiff
path: root/package/grub
diff options
context:
space:
mode:
Diffstat (limited to 'package/grub')
-rw-r--r--package/grub/Makefile2
-rw-r--r--package/grub/files/grub-dual.cfg12
-rw-r--r--package/grub/files/grub.cfg6
3 files changed, 12 insertions, 8 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index b36d9f788..519958096 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -10,7 +10,7 @@ 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://ftp.gnu.org/gnu/grub/
PKG_NOPARALLEL:= 1
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
}