* [gentoo-commits] gentoo-x86 commit in sys-kernel/genkernel: genkernel-99999.ebuild ChangeLog genkernel-3.4.11.1.ebuild genkernel-9999.ebuild
@ 2011-01-20 18:03 Sebastian Pipping (sping)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2011-01-20 18:03 UTC (permalink / raw
To: gentoo-commits
sping 11/01/20 18:03:21
Modified: genkernel-99999.ebuild ChangeLog
genkernel-3.4.11.1.ebuild genkernel-9999.ebuild
Log:
sys-kernel/genkernel: Call "make" for live ebuilds only (bug #352250)
(Portage version: 2.1.9.34/cvs/Linux x86_64)
Revision Changes Path
1.7 sys-kernel/genkernel/genkernel-99999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?r1=1.6&r2=1.7
Index: genkernel-99999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- genkernel-99999.ebuild 17 Jan 2011 16:03:24 -0000 1.6
+++ genkernel-99999.ebuild 20 Jan 2011 18:03:21 -0000 1.7
@@ -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-kernel/genkernel/genkernel-99999.ebuild,v 1.6 2011/01/17 16:03:24 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v 1.7 2011/01/20 18:03:21 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -79,6 +79,10 @@
use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
}
+src_compile() {
+ [[ ${PV} == 9999* ]] && emake || die
+}
+
src_install() {
# This block updates genkernel.conf
sed \
1.235 sys-kernel/genkernel/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?r1=1.234&r2=1.235
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- ChangeLog 20 Jan 2011 15:18:41 -0000 1.234
+++ ChangeLog 20 Jan 2011 18:03:21 -0000 1.235
@@ -1,6 +1,12 @@
# ChangeLog for sys-kernel/genkernel
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.234 2011/01/20 15:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.235 2011/01/20 18:03:21 sping Exp $
+
+ 20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
+ genkernel-9999.ebuild, genkernel-99999.ebuild:
+ Call "make" for live ebuilds only (bug #352250). Then asciidoc is not a build
+ time dependency as the man page is shipped with genkernel. Therefore I
+ reverted zmedico's previous commit.
20 Jan 2011; Zac Medico <zmedico@gentoo.org> genkernel-3.4.11.1.ebuild:
3.4.11.1 calls a2x now, so app-text/asciidoc dep needs to be unconditional.
1.3 sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?r1=1.2&r2=1.3
Index: genkernel-3.4.11.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- genkernel-3.4.11.1.ebuild 20 Jan 2011 15:18:41 -0000 1.2
+++ genkernel-3.4.11.1.ebuild 20 Jan 2011 18:03:21 -0000 1.3
@@ -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-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.2 2011/01/20 15:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.3 2011/01/20 18:03:21 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -64,7 +64,9 @@
selinux? ( sys-libs/libselinux )"
RDEPEND="${DEPEND} app-arch/cpio"
-DEPEND="${DEPEND} app-text/asciidoc"
+if [[ ${PV} == 9999* ]]; then
+ DEPEND="${DEPEND} app-text/asciidoc"
+fi
src_unpack() {
if [[ ${PV} == 9999* ]] ; then
@@ -75,6 +77,10 @@
use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
}
+src_compile() {
+ [[ ${PV} == 9999* ]] && emake || die
+}
+
src_install() {
# This block updates genkernel.conf
sed \
1.22 sys-kernel/genkernel/genkernel-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?r1=1.21&r2=1.22
Index: genkernel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- genkernel-9999.ebuild 16 Jan 2011 21:11:14 -0000 1.21
+++ genkernel-9999.ebuild 20 Jan 2011 18:03:21 -0000 1.22
@@ -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-kernel/genkernel/genkernel-9999.ebuild,v 1.21 2011/01/16 21:11:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.22 2011/01/20 18:03:21 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -77,6 +77,10 @@
use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
}
+src_compile() {
+ [[ ${PV} == 9999* ]] && emake || die
+}
+
src_install() {
# This block updates genkernel.conf
sed \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-kernel/genkernel: genkernel-99999.ebuild ChangeLog genkernel-3.4.11.1.ebuild genkernel-9999.ebuild
@ 2011-01-20 20:21 Sebastian Pipping (sping)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2011-01-20 20:21 UTC (permalink / raw
To: gentoo-commits
sping 11/01/20 20:21:05
Modified: genkernel-99999.ebuild ChangeLog
genkernel-3.4.11.1.ebuild genkernel-9999.ebuild
Log:
sys-kernel/genkernel: Fix broken Bash logic (still bug #352250 in a way)
(Portage version: 2.1.9.34/cvs/Linux x86_64)
Revision Changes Path
1.8 sys-kernel/genkernel/genkernel-99999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild?r1=1.7&r2=1.8
Index: genkernel-99999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- genkernel-99999.ebuild 20 Jan 2011 18:03:21 -0000 1.7
+++ genkernel-99999.ebuild 20 Jan 2011 20:21:05 -0000 1.8
@@ -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-kernel/genkernel/genkernel-99999.ebuild,v 1.7 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v 1.8 2011/01/20 20:21:05 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -80,7 +80,9 @@
}
src_compile() {
- [[ ${PV} == 9999* ]] && emake || die
+ if [[ ${PV} == 9999* ]]; then
+ emake || die
+ fi
}
src_install() {
1.236 sys-kernel/genkernel/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.236&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.236&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?r1=1.235&r2=1.236
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- ChangeLog 20 Jan 2011 18:03:21 -0000 1.235
+++ ChangeLog 20 Jan 2011 20:21:05 -0000 1.236
@@ -1,6 +1,16 @@
# ChangeLog for sys-kernel/genkernel
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.235 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.236 2011/01/20 20:21:05 sping Exp $
+
+ 20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
+ genkernel-9999.ebuild, genkernel-99999.ebuild:
+ Fix broken Bash logic (still bug #352250 in a way)
+
+ A: false && true || echo die
+ B: { false && true ; } || echo die
+ C: false && { true || echo die ; }
+
+ Despite basic testing, I wrongly assumed A=C. In contrast, A=B is true.
20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
genkernel-9999.ebuild, genkernel-99999.ebuild:
1.4 sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild?r1=1.3&r2=1.4
Index: genkernel-3.4.11.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- genkernel-3.4.11.1.ebuild 20 Jan 2011 18:03:21 -0000 1.3
+++ genkernel-3.4.11.1.ebuild 20 Jan 2011 20:21:05 -0000 1.4
@@ -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-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.3 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.4 2011/01/20 20:21:05 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -78,7 +78,9 @@
}
src_compile() {
- [[ ${PV} == 9999* ]] && emake || die
+ if [[ ${PV} == 9999* ]]; then
+ emake || die
+ fi
}
src_install() {
1.23 sys-kernel/genkernel/genkernel-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?r1=1.22&r2=1.23
Index: genkernel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- genkernel-9999.ebuild 20 Jan 2011 18:03:21 -0000 1.22
+++ genkernel-9999.ebuild 20 Jan 2011 20:21:05 -0000 1.23
@@ -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-kernel/genkernel/genkernel-9999.ebuild,v 1.22 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.23 2011/01/20 20:21:05 sping Exp $
# genkernel-9999 -> latest Git master
# genkernel-99999 -> latest Git experimental
@@ -78,7 +78,9 @@
}
src_compile() {
- [[ ${PV} == 9999* ]] && emake || die
+ if [[ ${PV} == 9999* ]]; then
+ emake || die
+ fi
}
src_install() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-20 20:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-20 20:21 [gentoo-commits] gentoo-x86 commit in sys-kernel/genkernel: genkernel-99999.ebuild ChangeLog genkernel-3.4.11.1.ebuild genkernel-9999.ebuild Sebastian Pipping (sping)
-- strict thread matches above, loose matches on Subject: below --
2011-01-20 18:03 Sebastian Pipping (sping)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox