summaryrefslogtreecommitdiff
path: root/libre/grub
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-10-16 08:34:55 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-10-16 08:40:55 -0300
commit1b95568fd6fd0770510bdddf45c356a24dddbadb (patch)
treeab28f23d19260d6e406674955af364246adb0243 /libre/grub
parentc6c2f420954117b1aa3309a9aa33612b94d75295 (diff)
downloadabslibre-1b95568fd6fd0770510bdddf45c356a24dddbadb.tar.gz
abslibre-1b95568fd6fd0770510bdddf45c356a24dddbadb.tar.bz2
abslibre-1b95568fd6fd0770510bdddf45c356a24dddbadb.zip
grub: fix grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
Diffstat (limited to 'libre/grub')
-rw-r--r--libre/grub/PKGBUILD4
-rw-r--r--libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch18
2 files changed, 12 insertions, 10 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 169bb234a..fa15c1ee5 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -371,7 +371,7 @@ pkgname=('grub')
[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone')
pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
pkgver='2.02.beta2'
-pkgrel='5.parabola7'
+pkgrel='5.parabola8'
epoch='1'
url='https://www.gnu.org/software/grub/'
arch=('x86_64' 'i686' 'armv7h')
@@ -428,7 +428,7 @@ md5sums=('SKIP'
'e506ae4a9f9f7d1b765febfa84e10d48'
'be55eabc102f2c60b38ed35c203686d6'
'8d1dd54ae4a1b550c097e056892ce953'
- '36b2a7531b615d5b8658a709b8104148'
+ 'a46695e19b588a53b8bac9e3b3c56096'
'e0133ad89ab3014210d4599f396a556e')
validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
index bc5375e9e..b620a39d0 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
+++ b/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
@@ -1,7 +1,7 @@
diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
---- a/util/grub.d/10_linux.in 2015-10-14 09:21:23.009705345 -0300
-+++ b/util/grub.d/10_linux.in 2015-10-14 09:49:42.279762099 -0300
-@@ -139,6 +139,24 @@
+--- a/util/grub.d/10_linux.in 2015-10-16 08:28:56.901970897 -0300
++++ b/util/grub.d/10_linux.in 2015-10-16 08:30:45.112786124 -0300
+@@ -139,6 +139,25 @@
initrd ${rel_dirname}/${initrd}
EOF
fi
@@ -22,11 +22,12 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+ echo '$(echo "$message" | grub_quote)'
+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb
+EOF
++ fi
+ fi
sed "s/^/$submenu_indentation/" << EOF
}
EOF
-@@ -222,6 +240,16 @@
+@@ -222,6 +241,16 @@
linux_root_device_thisversion=${GRUB_DEVICE}
fi
@@ -44,9 +45,9 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
---- a/util/grub.d/20_linux_xen.in 2015-10-14 09:21:23.009705345 -0300
-+++ b/util/grub.d/20_linux_xen.in 2015-10-14 09:49:53.814856968 -0300
-@@ -132,6 +132,24 @@
+--- a/util/grub.d/20_linux_xen.in 2015-10-16 08:28:56.901970897 -0300
++++ b/util/grub.d/20_linux_xen.in 2015-10-16 08:31:03.152921373 -0300
+@@ -132,6 +132,25 @@
module --nounzip ${rel_dirname}/${initrd}
EOF
fi
@@ -67,11 +68,12 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+ echo '$(echo "$message" | grub_quote)'
+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb
+EOF
++ fi
+ fi
sed "s/^/$submenu_indentation/" << EOF
}
EOF
-@@ -235,6 +253,16 @@
+@@ -235,6 +254,16 @@
linux_root_device_thisversion=${GRUB_DEVICE}
fi