Fix building with latest upstream revs #324587 by Jeff Kowalczyk.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 45 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index e2c764731f84..9af1f6a02fcc 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.135 2010/06/25 06:19:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.136 2010/07/06 00:33:33 vapier Exp $
+
+  06 Jul 2010; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
+  +files/grub-1.99-genkernel.patch, grub-9999.ebuild:
+  Fix building with latest upstream revs #324587 by Jeff Kowalczyk.
 
 *grub-0.97-r10 (25 Jun 2010)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 84e39cce4c86..f5dfe3d26094 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.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
@@ -33,7 +37,14 @@ EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.98.ebuild 2826 RMD160 6860e3a286f21db8db722b5c994568cdb6f5a3d4 SHA1 0414bd2958168f95f2dd643ccb54252224eb57ff SHA256 06b7e4f20080fdab9c707472f108a67e659bcab497d964421b97150f11d3df1d
-EBUILD grub-9999.ebuild 2780 RMD160 2581018e303b3aec6edd2c15c6f5fc0b2833a7c9 SHA1 08f1fd19445df875ecb42904ddbc678a2889c0fc SHA256 2a73372384ebcdf8f3bc0d9fcddb2612de6cd10ed7d2be9d8757634ce93c462a
-MISC ChangeLog 28521 RMD160 7da978878776bf009a0ddca701abc229cf3fb963 SHA1 7c0f7f22f4c4eec75e31993cf3130f4e1fee736b SHA256 0d99f22abbce17af9f91e0b52cc22666f5f243768b132a77894d611f2e517bb5
+EBUILD grub-1.98.ebuild 2848 RMD160 46e14f2055bf315801513078f8211815ea60a63e SHA1 31f2758175a0a285d39f9a3c8616e4d04650a2b1 SHA256 f88366db104ff1b31ea0186f198ba95cc7c7fc3a6c7aa3dcee48583af75a085e
+EBUILD grub-9999.ebuild 2882 RMD160 a687442cb6255f74313a958d6d6675536eed2444 SHA1 f54a77b8a72fcd8c0f00060625ceb826e7781ed8 SHA256 a998c12087daef1951b56c26363e09e9686ee0efe2df9b2c78cc2ecee2e72cd1
+MISC ChangeLog 28711 RMD160 d9705b450ed4e12d8306fedbd25d1a6f7c88cb37 SHA1 45039d3a4ecd1b114a54c2bd9d6a6ef6fe36dac3 SHA256 21386da57e62a6ea3b51e4e8279c424f41fd6ed9fef132bcde4e83d953f88aea
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwyeYoACgkQTwhj9JtAlp46LgD/XK+3O83nZ3mcWWJ1IlIc4+SX
+m9Zh1qvqLeFMNjlG0hkBAIxzXgMcsnTiM9vT8nqCbHaxWYoU9/ULJyh73hA7lSQJ
+=5ZTl
+-----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
new file mode 100644
index 000000000000..4947f8cec2d5
--- /dev/null
+++ b/sys-boot/grub/files/grub-1.99-genkernel.patch
@@ -0,0 +1,19 @@
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
+@@ -102,7 +102,7 @@
+ EOF
+ }
+ 
+-list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
++list=`for i in /boot/kernel-* /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
+         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+       done`
+ prepare_boot_cache=
+@@ -120,6 +120,7 @@
+   initrd=
+   for i in "initrd.img-${version}" "initrd-${version}.img" \
+ 	   "initrd-${version}" "initramfs-${version}.img" \
++	   "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
+     if test -e "${dirname}/${i}" ; then
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
index 9dca37fe657f..2fea4f2b81aa 100644
--- a/sys-boot/grub/grub-1.98.ebuild
+++ b/sys-boot/grub/grub-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.2 2010/05/08 17:21:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.3 2010/07/06 00:33:33 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 94123c7c5051..246179d87fea 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.20 2010/05/08 17:21:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.21 2010/07/06 00:33:33 vapier Exp $
+
+# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -29,7 +31,7 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -38,7 +40,7 @@ src_unpack() {
 		unpack ${A}
 	fi
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
+	epatch "${FILESDIR}"/${PN}-1.99-genkernel.patch #256335
 	epatch_user
 
 	# autogen.sh does more than just run autotools