Locate kernels made by genkernel #256335 and mark Gentoo as the distro.

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

4 files changed, 38 insertions, 8 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index edef3e9b1db3..3ec26ec0fef6 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.111 2009/02/28 10:26:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.112 2009/03/14 13:28:30 vapier Exp $
+
+  14 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/grub-1.96-genkernel.patch, grub-9999.ebuild:
+  Locate kernels made by genkernel #256335 and mark Gentoo as the distro.
 
   28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
   custom-cflags is a global USE-flag
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index dcff9ce5dce7..a72e9b78e629 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
+AUX grub-1.96-genkernel.patch 298 RMD160 3acae46d0c9a6b0c97960728751c679e32f0521d SHA1 b496e4486a546cfb72b81b27d8642c7d2e5123cb SHA256 8cbbaf1db68c39dfcc30b59779d820e9e9dca7ef957431791cdc0fc24e258eaf
 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
@@ -35,13 +36,13 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce
 EBUILD grub-0.97-r9.ebuild 8871 RMD160 416d7741c305e4ce83639916a66ee0925e4ee08e SHA1 30b35dbed2823e71285c6bbd1a46b661aa1d91d5 SHA256 e65a4bb5b4e9fcf702e663296d895a54426d60e9181f1815a9ac29f0003ca44d
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.96.ebuild 1936 RMD160 5531edc5fe8401d22ddbdf16fc60f0f30aee8fee SHA1 97b2783ac93128d47a0ce74287c720d283e77bf2 SHA256 0ace464dd9e922fc4c13dad0ef2faabced5cab6694f3d58d839cd1f8ef4c7f2f
-EBUILD grub-9999.ebuild 1935 RMD160 ef31b1ec6cd5bdf9effb73a3f1971fbfc1b6a046 SHA1 384fc8c1fd420a4726c7d8d05cacfc0aeab9237f SHA256 7d9297483f31ee84e2ce6cda7e89e846180883a7fc75695efd8aee303a494d92
-MISC ChangeLog 24901 RMD160 0930e519e48171dcac9c40a9f392f6be2f5aad64 SHA1 dbf944ab3d89a3133b3723706f8fbe1378fb509a SHA256 82686624b7e234d7113db3c875b99433758327441456a60953b2a7b762bff8b0
+EBUILD grub-9999.ebuild 2189 RMD160 2e0a924284c561e9c2a5c3feb4ed8fe94f50460b SHA1 b9298895f7db064595b11069b379afbae854ab45 SHA256 41e48eb125a211716709575e093eb45bc6bdf816a0bb245a4ce8f2e4cd80e81e
+MISC ChangeLog 25080 RMD160 4df641efbaa2388a7e5329fe4d85779476c2030d SHA1 b29e6a0399de56fd20c0b860916cc3481ac46e87 SHA256 307f1eaf046ad7164dad0f4d843d6167448b28c74da13b841599a941131e6f68
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmpEa0ACgkQkKaRLQcq0GJIxwCeIQeE+Dwf3N1zEsGnISDdSa9x
-Q1IAn0gTO5IZ9UDab1PqppYx28Dvk9tW
-=Dybr
+iEYEARECAAYFAkm7sQQACgkQn/5bYzqsSmFtoACeNUCwUrRZUxemA8Py92wsM1vG
+28kAoJREY7w57KJ+0BXMp6zxV9Xg1SNY
+=507C
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-1.96-genkernel.patch b/sys-boot/grub/files/grub-1.96-genkernel.patch
new file mode 100644
index 000000000000..471fc66a99da
--- /dev/null
+++ b/sys-boot/grub/files/grub-1.96-genkernel.patch
@@ -0,0 +1,11 @@
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
+@@ -93,7 +93,7 @@
+   echo "$a"
+ }
+ 
+-list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
++list=`for i in /boot/kernel-* /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+       done`
+ 
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 660ea937f6e2..10b84fd67757 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5 2009/01/01 11:24:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.6 2009/03/14 13:28:30 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -28,6 +28,16 @@ PROVIDE="virtual/bootloader"
 export STRIP_MASK="*/grub/*/*.mod"
 QA_EXECSTACK="sbin/grub-probe sbin/grub-setup"
 
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
+}
+
 src_compile() {
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
@@ -43,6 +53,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+	GRUB_DISTRIBUTOR="Gentoo"
+	EOF
+	EOF
 	if use multislot ; then
 		sed -i s:grub-install:grub2-install: "${D}"/sbin/grub-install
 		mv "${D}"/sbin/grub{,2}-install || die