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
commitb6bd758e3097271f1206b3e45a2dffdf773c37fc (patch)
tree54c24891a6fb802f391eccc3da2376424d70e97d /sys-boot/grub
parentDisable grub-mkconfig as older versions didnt have it #266675 by Mikhail. (diff)
downloadgentoo-2-b6bd758e3097271f1206b3e45a2dffdf773c37fc.tar.gz
gentoo-2-b6bd758e3097271f1206b3e45a2dffdf773c37fc.tar.bz2
gentoo-2-b6bd758e3097271f1206b3e45a2dffdf773c37fc.zip
Generate autotool files now that upstream removed things from svn #267233 by James Erickson.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-9999.ebuild9
2 files changed, 11 insertions, 4 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/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