From: "Mike Gilbert (floppym)" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Date: Sun, 1 Jul 2012 21:31:16 +0000 (UTC) [thread overview]
Message-ID: <20120701213116.B4A192004B@flycatcher.gentoo.org> (raw)
floppym 12/07/01 21:31:16
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Add patch to fix build race for bug 424231 by Wonko.
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Revision Changes Path
1.75 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.74&r2=1.75
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- grub-9999.ebuild 29 Jun 2012 22:06:15 -0000 1.74
+++ grub-9999.ebuild 1 Jul 2012 21:31:16 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.74 2012/06/29 22:06:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.75 2012/07/01 21:31:16 floppym Exp $
EAPI=4
@@ -19,6 +19,7 @@
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@
>=dev-lang/python-2.5.2
sys-devel/flex
sys-devel/bison
+ sys-apps/help2man
sys-apps/texinfo
static? (
truetype? (
@@ -84,7 +86,7 @@
grub_platforms_efi-64? ( sys-boot/efibootmgr )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
- DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,8 @@
src_prepare() {
local i j
+ epatch "${FILESDIR}/${P}-manpage-race.patch"
+
# fix texinfo file name, bug 416035
sed -i \
-e 's/^\* GRUB:/* GRUB2:/' \
1.9 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.8&r2=1.9
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grub-2.00.ebuild 29 Jun 2012 22:06:15 -0000 1.8
+++ grub-2.00.ebuild 1 Jul 2012 21:31:16 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.9 2012/07/01 21:31:16 floppym Exp $
EAPI=4
@@ -19,6 +19,7 @@
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@
>=dev-lang/python-2.5.2
sys-devel/flex
sys-devel/bison
+ sys-apps/help2man
sys-apps/texinfo
static? (
truetype? (
@@ -84,7 +86,7 @@
grub_platforms_efi-64? ( sys-boot/efibootmgr )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
- DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,8 @@
src_prepare() {
local i j
+ epatch "${FILESDIR}/${P}-manpage-race.patch"
+
# fix texinfo file name, bug 416035
sed -i \
-e 's/^\* GRUB:/* GRUB2:/' \
1.224 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 29 Jun 2012 22:06:15 -0000 1.223
+++ ChangeLog 1 Jul 2012 21:31:16 -0000 1.224
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.223 2012/06/29 22:06:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.224 2012/07/01 21:31:16 floppym Exp $
+
+ 01 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+ +files/grub-2.00-manpage-race.patch,
+ -files/grub-2.00-10_linux-genkernel.patch, grub-2.00.ebuild, grub-9999.ebuild:
+ Add patch to fix build race for bug 424231 by Wonko.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
next reply other threads:[~2012-07-01 21:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-01 21:31 Mike Gilbert (floppym) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 2:14 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog Mike Gilbert (floppym)
2012-07-22 18:29 Mike Gilbert (floppym)
2012-07-22 16:43 Mike Gilbert (floppym)
2012-07-18 16:34 Mike Gilbert (floppym)
2012-07-13 18:05 Mike Gilbert (floppym)
2012-07-07 22:55 Mike Gilbert (floppym)
2012-07-01 22:11 Mike Gilbert (floppym)
2012-06-29 22:06 Mike Gilbert (floppym)
2012-06-29 15:34 Mike Gilbert (floppym)
2012-06-29 3:10 Mike Gilbert (floppym)
2012-06-29 3:02 Mike Gilbert (floppym)
2012-06-29 2:51 Mike Gilbert (floppym)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120701213116.B4A192004B@flycatcher.gentoo.org \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox