| 1 |
commit: 5580fdf0d0a03846328e1c86d1071e4de6405095 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 12 20:35:15 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 15 09:10:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5580fdf0 |
| 7 |
|
| 8 |
kernel-2.eclass: Inherit python-any-r1 only in deblob branch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/12684 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/kernel-2.eclass | 8 +++++--- |
| 14 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 17 |
index 1b2b5d3e8b6..95011df82d8 100644 |
| 18 |
--- a/eclass/kernel-2.eclass |
| 19 |
+++ b/eclass/kernel-2.eclass |
| 20 |
@@ -191,9 +191,7 @@ |
| 21 |
# If you do change them, there is a chance that we will not fix resulting bugs; |
| 22 |
# that of course does not mean we're not willing to help. |
| 23 |
|
| 24 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
| 25 |
- |
| 26 |
-inherit toolchain-funcs python-any-r1 |
| 27 |
+inherit toolchain-funcs |
| 28 |
[[ ${EAPI:-0} == [012345] ]] && inherit epatch |
| 29 |
[[ ${EAPI:-0} == [0123456] ]] && inherit estack eapi7-ver |
| 30 |
case ${EAPI:-0} in |
| 31 |
@@ -621,6 +619,10 @@ if [[ ${ETYPE} == sources ]]; then |
| 32 |
kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ |
| 33 |
K_DEBLOB_AVAILABLE=1 |
| 34 |
if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then |
| 35 |
+ PYTHON_COMPAT=( python2_7 ) |
| 36 |
+ |
| 37 |
+ inherit python-any-r1 |
| 38 |
+ |
| 39 |
IUSE="${IUSE} deblob" |
| 40 |
|
| 41 |
# Reflect that kernels contain firmware blobs unless otherwise |
Archives