summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-04-27 05:23:28 +0000
committerMike Frysinger <vapier@gentoo.org>2009-04-27 05:23:28 +0000
commit5592743648dc5a487cddb9123db65caad0baf9ce (patch)
tree77f724e86a496f710de7a21753e139bbcc704a8e /sys-boot
parentDisable grub-mkconfig as older versions didnt have it #266675 by Mikhail. (diff)
downloadhistorical-5592743648dc5a487cddb9123db65caad0baf9ce.tar.gz
historical-5592743648dc5a487cddb9123db65caad0baf9ce.tar.bz2
historical-5592743648dc5a487cddb9123db65caad0baf9ce.zip
Generate autotool files now that upstream removed things from svn #267233 by James Erickson.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/Manifest10
-rw-r--r--sys-boot/grub/grub-9999.ebuild9
3 files changed, 16 insertions, 9 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 4b11db293a86..3b08de94d7fa 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.113 2009/04/27 05:09:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.114 2009/04/27 05:23:28 vapier Exp $
+
+ 27 Apr 2009; Mike Frysinger <vapier@gentoo.org> grub-9999:
+ Generate autotool files now that upstream removed things from svn #267233
+ by James Erickson.
27 Apr 2009; Mike Frysinger <vapier@gentoo.org> grub-1.96:
Disable grub-mkconfig as older versions didnt have it #266675 by Mikhail.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c1f00759c26d..2838673f39a8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -36,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 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2
-EBUILD grub-9999.ebuild 2189 RMD160 2e0a924284c561e9c2a5c3feb4ed8fe94f50460b SHA1 b9298895f7db064595b11069b379afbae854ab45 SHA256 41e48eb125a211716709575e093eb45bc6bdf816a0bb245a4ce8f2e4cd80e81e
-MISC ChangeLog 25218 RMD160 8729e756e5a58691a83966423aa5832da19da515 SHA1 9c72bc8bdbee5e1f41bed67725e576ff33292a08 SHA256 c59620ec08510ca09a5a62d8b96bde57df5f98ddccede9aec0b8e51d669807df
+EBUILD grub-9999.ebuild 2307 RMD160 979bc5428644a33045144c0704d5d10677bc1c1b SHA1 44f2a4425caa7bcc6f1d5d895383a06975cf9a85 SHA256 978fb615d885e643d456e5ad78f8b98d2fce4c3955e24e481ef9bb48d250303c
+MISC ChangeLog 25377 RMD160 f8d6cbacd8d3f84ab6b266d7dac5d29cc0a21d5f SHA1 63d010d06a54de9f082cdb5e1ad1befc8fdbd721 SHA256 d38cbdbf2bd65304bea4fdbbf9bb78e62c915df94d6bd9ba0bd7ec60ad78e034
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkn1PfUACgkQn/5bYzqsSmEzXgCgySTY3Rwwbqtc5Nw1r+U76LRQ
-zFYAoMuWYHM2kHfoxY8H+vk2FiRVi3L2
-=qArp
+iEYEARECAAYFAkn1QVYACgkQn/5bYzqsSmE1ZQCgm9/nDfVgNrgYA3ak8Boty8Uw
+YsIAoMSmxnXLI2TuhWCaZl1WrZah70js
+=jZda
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 10b84fd67757..74cbea124b80 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,8 +1,8 @@
# 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.6 2009/03/14 13:28:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.7 2009/04/27 05:23:28 vapier Exp $
-inherit mount-boot eutils flag-o-matic toolchain-funcs
+inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="svn://svn.sv.gnu.org/grub/trunk/grub2"
@@ -36,6 +36,10 @@ src_unpack() {
fi
cd "${S}"
epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
+
+ # autogen.sh does more than just run autotools
+ sed -i -e 's:^auto:eauto:' autogen.sh
+ (. ./autogen.sh) || die
}
src_compile() {
@@ -56,7 +60,6 @@ src_install() {
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