[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)

Ronald van Haren ronald at archlinux.org
Sat Aug 27 12:51:07 UTC 2011


    Date: Saturday, August 27, 2011 @ 08:51:06
  Author: ronald
Revision: 136358

upgpkg: grub2 1:1.99-5

fix kernel detection  non-official kernels

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/archlinux_grub2_mkconfig_fixes.patch

--------------------------------------+
 PKGBUILD                             |    4 ++--
 archlinux_grub2_mkconfig_fixes.patch |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-27 10:47:43 UTC (rev 136357)
+++ PKGBUILD	2011-08-27 12:51:06 UTC (rev 136358)
@@ -13,7 +13,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase="grub2"
 pkgver='1.99'
-pkgrel=4
+pkgrel=5
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -43,7 +43,7 @@
           'b04994c005910b4bf123f034b30109d5c8d6fd86'
           'e0c1a97770cc23226cf4535c029ef50b17f67974'
           '8bcaed545956bb33581e1b97ac96a2c3717ec793'
-          'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de'
+          '10d915c90203a33610b19da438ae02ac4376fb74'
           'e1477db3700b27b5e5ad3d8fa43028555204759b'
           '8948d89537c12a4202df7c001e65a77030bbe5a3'
           '82a27eca5277218cf57c6c5767e0b17a72f62229'

Modified: archlinux_grub2_mkconfig_fixes.patch
===================================================================
--- archlinux_grub2_mkconfig_fixes.patch	2011-08-27 10:47:43 UTC (rev 136357)
+++ archlinux_grub2_mkconfig_fixes.patch	2011-08-27 12:51:06 UTC (rev 136358)
@@ -56,7 +56,7 @@
  	   "initramfs-genkernel-${version}" \
 -	   "initramfs-genkernel-${alt_version}"; do
 +	   "initramfs-genkernel-${alt_version}" \
-+	   "${basename/vmlinuz/kernel}.img"; do
++	   "${basename/vmlinuz/initramfs}.img" "${basename/vmlinuz/kernel}.img"; do
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
@@ -65,7 +65,7 @@
    linux_entry "${OS}" "${version}" false \
        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 +  for i in "initramfs-${version}-fallback.img" \
-+	   "${basename/vmlinuz/kernel}-fallback.img"; do
++	   "${basename/vmlinuz/initramfs}-fallback.img" "${basename/vmlinuz/kernel}-fallback.img"; do
 +    if test -e "${dirname}/${i}"; then
 +      initrd="$i"
 +      linux_entry "${OS}" "${version}" true \




More information about the arch-commits mailing list