summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-11-10 10:31:10 +0000
committerMike Frysinger <vapier@gentoo.org>2010-11-10 10:31:10 +0000
commit380984429dffe02d540b7e5303782cee108296e8 (patch)
treef0a1490538dd019ad3d3e13b8c319ac934747bf3
parentFix digest (bug #344815 by Isidoro Garcia) properly. (diff)
downloadhistorical-380984429dffe02d540b7e5303782cee108296e8.tar.gz
historical-380984429dffe02d540b7e5303782cee108296e8.tar.bz2
historical-380984429dffe02d540b7e5303782cee108296e8.zip
update patch by Jiří Moravec to apply to latest bzr tree #343293 by Jeff Kowalczyk
Package-Manager: portage-2.2_rc96/cvs/Linux x86_64
-rw-r--r--sys-boot/grub/Manifest8
-rw-r--r--sys-boot/grub/files/grub-1.99-genkernel.patch8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 3e121cad31a2..33b144b118ec 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0
-AUX grub-1.99-genkernel.patch 703 RMD160 81af10caf107087fd65ee3710806fd4eb6b94b72 SHA1 c09ea4c94ed3fd8aaaefafa319f5d0bcc29c8c04 SHA256 04b0d6a30502d365fd5b320b666a8439f29061d788c74abeca1ebfaaf1c81774
+AUX grub-1.99-genkernel.patch 745 RMD160 02675a7c654b46b9047a432004cfd8d6d1b74649 SHA1 3d0e32b99e716e85a17d28db8d29679c30af8a11 SHA256 19e266d18b2e7ec41a39be06a12f4a2a647155590a30ed4c79e5caf6a60a4343
AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA1 15bd5aaa816728583235ab0d5477c1ac32855583 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37
@@ -44,7 +44,7 @@ MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iF4EAREIAAYFAkytSqQACgkQTwhj9JtAlp7i5gEAhJABqO9CIzXoWsDl/ZG7s58m
-DSm5Wp08Ld5sxBE6a5QBAKqN8TKiI3M9Z78Mi0FeNF24CStWXLL2TYVRq6UptO9+
-=HU86
+iF4EAREIAAYFAkzadGQACgkQTwhj9JtAlp7UCwD/V0Nh1detrkZ7vTSAKqknNL2R
+unAIINMRbYNIqNPldrABAKENg50evPDRl9y6MWd0aW7V8AWLDm/cZ9cnTgAAbEBv
+=/Lnd
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-1.99-genkernel.patch b/sys-boot/grub/files/grub-1.99-genkernel.patch
index 4947f8cec2d5..4d4aee5a0e9e 100644
--- a/sys-boot/grub/files/grub-1.99-genkernel.patch
+++ b/sys-boot/grub/files/grub-1.99-genkernel.patch
@@ -1,15 +1,15 @@
--- util/grub.d/10_linux.in
+++ util/grub.d/10_linux.in
-@@ -102,7 +102,7 @@
+@@ -109,7 +109,7 @@
EOF
}
--list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
-+list=`for i in /boot/kernel-* /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
+-list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
++list=`for i in /boot/kernel-* /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done`
prepare_boot_cache=
-@@ -120,6 +120,7 @@
+@@ -127,6 +127,7 @@
initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" \
"initrd-${version}" "initramfs-${version}.img" \