From: "Mike Pagano (mpagano)" <mpagano@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
Date: Fri, 17 Jan 2014 18:14:23 +0000 (UTC) [thread overview]
Message-ID: <20140117181423.5FBFA2004C@flycatcher.gentoo.org> (raw)
mpagano 14/01/17 18:14:23
Modified: ChangeLog kernel-2.eclass
Log:
Fix kernel-2.eclass to use python.eclass for it's python needs. (deblob script). See bug #497966
Revision Changes Path
1.1121 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1120&r2=1.1121
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1120
retrieving revision 1.1121
diff -u -r1.1120 -r1.1121
--- ChangeLog 17 Jan 2014 16:33:15 -0000 1.1120
+++ ChangeLog 17 Jan 2014 18:14:23 -0000 1.1121
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1120 2014/01/17 16:33:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1121 2014/01/17 18:14:23 mpagano Exp $
+
+ 17 Jan 2014; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass:
+ Fix kernel-2.eclass to use python.eclass for it's python needs. (deblob
+ script). See bug #497966
17 Jan 2014; Jeroen Roovers <jer@gentoo.org> mozcoreconf-2.eclass:
Revert inadvertent change, as noted by arfrever.
1.292 eclass/kernel-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.292&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.292&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.291&r2=1.292
Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- kernel-2.eclass 22 Nov 2013 13:35:09 -0000 1.291
+++ kernel-2.eclass 17 Jan 2014 18:14:23 -0000 1.292
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.291 2013/11/22 13:35:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.292 2014/01/17 18:14:23 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -461,7 +461,7 @@
kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
K_DEBLOB_AVAILABLE=1
if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
- IUSE="${IUSE} deblob"
+ IUSE="${IUSE} deblob python"
# Reflect that kernels contain firmware blobs unless otherwise
# stripped
LICENSE="${LICENSE} !deblob? ( freedist )"
@@ -488,7 +488,11 @@
DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
- DEPEND+=" deblob? ( =dev-lang/python-2* )"
+ #deblob script currently only works with python-2
+ PYTHON_DEPEND="python? 2"
+ PYTHON_USE_WITH_OPT="python"
+ inherit python
+
KERNEL_URI="${KERNEL_URI}
deblob? (
${DEBLOB_URI}
@@ -1225,7 +1229,7 @@
if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
echo ">>> Running deblob script ..."
- EPYTHON="python2" sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!"
+ sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!"
fi
}
next reply other threads:[~2014-01-17 18:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 18:14 Mike Pagano (mpagano) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-19 15:46 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass Mike Pagano (mpagano)
2015-06-27 17:41 Mike Pagano (mpagano)
2015-06-27 17:27 Mike Pagano (mpagano)
2015-06-27 15:36 Mike Pagano (mpagano)
2015-06-27 0:50 Mike Pagano (mpagano)
2015-06-26 22:32 Mike Pagano (mpagano)
2015-05-30 16:09 Mike Pagano (mpagano)
2015-05-14 19:26 Mike Pagano (mpagano)
2015-04-29 0:07 Mike Pagano (mpagano)
2015-04-27 18:59 Mike Pagano (mpagano)
2015-03-20 0:13 Mike Pagano (mpagano)
2015-02-27 23:44 Mike Pagano (mpagano)
2015-02-23 12:42 Mike Pagano (mpagano)
2014-11-28 17:40 Mike Pagano (mpagano)
2014-04-21 0:08 Mike Pagano (mpagano)
2014-04-14 20:21 Tom Wijsman (tomwij)
2014-01-18 14:53 Mike Gilbert (floppym)
2014-01-17 19:05 Mike Pagano (mpagano)
2013-11-18 13:19 Tom Wijsman (tomwij)
2013-11-02 12:58 Tom Wijsman (tomwij)
2013-09-05 17:04 Tom Wijsman (tomwij)
2013-07-31 21:18 Julian Ospald (hasufell)
2013-07-15 14:04 Samuli Suominen (ssuominen)
2013-04-29 22:14 Tom Wijsman (tomwij)
2013-04-17 20:59 Tom Wijsman (tomwij)
2013-04-17 13:52 Tom Wijsman (tomwij)
2013-03-20 16:45 Tom Wijsman (tomwij)
2013-03-20 7:55 Tom Wijsman (tomwij)
2013-03-09 21:05 Tom Wijsman (tomwij)
2013-03-05 19:52 Mike Pagano (mpagano)
2012-06-24 17:52 Mike Pagano (mpagano)
2012-06-06 17:00 Mike Pagano (mpagano)
2012-03-17 0:02 Mike Pagano (mpagano)
2011-12-28 13:38 Stratos Psomadakis (psomas)
2011-11-08 1:05 Mike Pagano (mpagano)
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=20140117181423.5FBFA2004C@flycatcher.gentoo.org \
--to=mpagano@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