summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-08-11 16:01:15 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2011-08-11 16:01:15 +0200
commit66a14c968b1e988ebf044018b6fd1dce420dd2ea (patch)
treec1fb8c377b026b447414850bb87c79a7531f09f5
parent48706e7ac79dcc7c73f0df7b44ce7ef4da9e29b8 (diff)
Recognize /boot/vmlinuz26 as kernel, fix sha1sums.
-rw-r--r--libre/grub2/PKGBUILD4
-rw-r--r--libre/grub2/parabola-mkconfig.patch13
2 files changed, 13 insertions, 4 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 891fca445..1d471d98e 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -45,11 +45,11 @@ sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
'e0c1a97770cc23226cf4535c029ef50b17f67974'
'8bcaed545956bb33581e1b97ac96a2c3717ec793'
'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de'
- '83bcaca902391f956ea415a0c712cea56d85d0c2'
+ 'd1252b837b13ebf817dbc45cfd4d772c7d1b621f'
'7df0516c6c45816aa330b775f1ed6f652e4f0380'
'82a27eca5277218cf57c6c5767e0b17a72f62229'
'beb31419045db70fee7401aa6448c220a491e2a3'
- 'cf148a6afe6067db48975cfd08fe5fb6c2d2bf24')
+ '27930016362d6647282405183b9977f0a7b15c1a')
build() {
# set architecture dependent variables
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
index b2a72e118..7c18a4cc2 100644
--- a/libre/grub2/parabola-mkconfig.patch
+++ b/libre/grub2/parabola-mkconfig.patch
@@ -1,6 +1,15 @@
diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in
---- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-10 23:56:57.323380821 +0200
-+++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 00:12:46.840005321 +0200
+--- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200
++++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200
+@@ -134,7 +134,7 @@
+
+ case x`uname -m` in
+ xi?86 | xx86_64)
+- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do
+ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+ done` ;;
+ *)
@@ -163,7 +163,8 @@
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \