Fix hardcoded grub-probe call. Fixes bug #380879. Revision bump so everyone gets the update.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 36 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index be6a3aca03d9..a0d48a06dc98 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.160 2011/08/28 10:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.161 2011/08/28 10:50:33 scarabeus Exp $
+
+*grub-1.99-r1 (28 Aug 2011)
+
+  28 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.99-call_proper_grub_probe.patch, -grub-1.99.ebuild,
+  +grub-1.99-r1.ebuild, grub-9999.ebuild:
+  Fix hardcoded grub-probe call. Fixes bug #380879. Revision bump so everyone
+  gets the update.
 
   28 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99.ebuild,
   grub-9999.ebuild, metadata.xml:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 721b08bcc9e3..f02aa393df25 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
 AUX grub.default 1227 RMD160 c1b5a7d6a2825d03d885672f4e749ceebb04b71b SHA1 aaafe3b3963487f879c05e538d2a86969cf9bd08 SHA256 4f0235da904532bb762e5fe8be61477a76f7ad0ace4c78735758312eccd30aa3
@@ -36,14 +37,14 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
-EBUILD grub-1.99.ebuild 6909 RMD160 e954e9057209253289ab0dc0ad0c3dafede69450 SHA1 89ee3e0662f0ae3a92949c50c5f8878e2752f0d2 SHA256 01d327924f949c0840e1c685f9bccb4175fb0e6fda632151f9ceaf8e7ad68b4b
-EBUILD grub-9999.ebuild 6910 RMD160 9b836903dd28315a5e3d1624b8319a9dc7031012 SHA1 71bca50698a388a7e7a4143c4831ab23e112933c SHA256 66a142245a9d330c392a719fe2ae9ce74093f18c0a368cde02220001a9d5a1ef
-MISC ChangeLog 32927 RMD160 d3361be049bda6679659ae369cce39eda707c5db SHA1 362f96dd95a7d872b1c5e7f36371bc0c0f175449 SHA256 534430ffe0da51a8128cbc209cf786bd64b80e8dc07b14c8ec467500529685c9
+EBUILD grub-1.99-r1.ebuild 6973 RMD160 88709b5e8ca598f293b446b5bdb4ae5dde14d826 SHA1 0168b841e32705b3117e6792e792eb903b5a70ed SHA256 63e64395ad077d8cb3f0427d9235022e0e627cc5198188c77347dbb184c5ecf7
+EBUILD grub-9999.ebuild 6971 RMD160 dcead9fa27720dadff5ed1605c4f111769eeff25 SHA1 adf0c9377860f173d84c952fdba9b845f5ce30e8 SHA256 93bc0f8facc540b518de7e05962be53c594d18db72280e05abe7b65c7fe6c66f
+MISC ChangeLog 33214 RMD160 bf69903fe676ac01af7e2e0c16b266e98090ebdd SHA1 0667e68f29f5bf7021d8ddc1c49589b3f55f68f7 SHA256 bb763ea7405a110c4797974fd186a43aa43f011b17403899a7aac518cd326dae
 MISC metadata.xml 515 RMD160 7ff103974a6e301b4ba14c55c674c1bf35b1a045 SHA1 05d70f211a5f37e1368b74f7a74b0830d8198787 SHA256 dc713fb7db877b0d8405ac8dba28c4253347205a46d677ffe71901c2f017fb0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5aGMIACgkQHB6c3gNBRYeBuACdG5G7Xdap5/eTwdjqQDXHWN+p
-DIYAoIcYg74OWcfOtARHGInmYuleJoMN
-=yOun
+iEYEARECAAYFAk5aHYAACgkQHB6c3gNBRYemHACgoVSMpjQyHCJLW3CulNzm04LV
+lBcAoILV4+y51O8DDHW4dQKMiLpI74Cm
+=SCRo
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/1.99-call_proper_grub_probe.patch b/sys-boot/grub/files/1.99-call_proper_grub_probe.patch
new file mode 100644
index 000000000000..6d65b5f85d3b
--- /dev/null
+++ b/sys-boot/grub/files/1.99-call_proper_grub_probe.patch
@@ -0,0 +1,12 @@
+diff -urN grub-1.99/util/grub.d/30_os-prober.in grub-1.99.new/util/grub.d/30_os-prober.in
+--- grub-1.99/util/grub.d/30_os-prober.in	2010-12-25 18:13:57.000000000 +0100
++++ grub-1.99.new/util/grub.d/30_os-prober.in	2011-08-28 12:35:40.965038455 +0200
+@@ -168,7 +168,7 @@
+       done
+     ;;
+     macosx)
+-      OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
++      OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
+       osx_entry xnu_kernel 32
+       osx_entry xnu_kernel64 64
+     ;;
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99-r1.ebuild
index f0a4f6585ae4..f6142f833214 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99.ebuild,v 1.2 2011/08/28 10:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v 1.1 2011/08/28 10:50:33 scarabeus Exp $
 
 EAPI=4
 
@@ -156,6 +156,9 @@ grub_src_install() {
 src_prepare() {
 	local i j archs
 
+	epatch \
+		"${FILESDIR}/1.99-call_proper_grub_probe.patch"
+
 	epatch_user
 
 	# autogen.sh does more than just run autotools
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index ba66a77dfe06..d379c1baca06 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.38 2011/08/28 10:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.39 2011/08/28 10:50:33 scarabeus Exp $
 
 EAPI=4
 
@@ -156,6 +156,9 @@ grub_src_install() {
 src_prepare() {
 	local i j archs
 
+	epatch \
+		"${FILESDIR}/1.99-call_proper_grub_probe.patch"
+
 	epatch_user
 
 	# autogen.sh does more than just run autotools