diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 37ded57695f4..f12b2c719722 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 88de05ca489a..27f32a84c440 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -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 @@ if [[ ${ETYPE} == sources ]]; then 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 @@ if [[ ${ETYPE} == sources ]]; then 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 @@ kernel-2_src_compile() { 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 } |