| 1 |
commit: e4872e85b2d28d3aca569c741ba8c67cc5942b9c |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 22 23:39:06 2015 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 22 23:40:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4872e85 |
| 7 |
|
| 8 |
kernel-2.eclass: use experimental in global scope |
| 9 |
|
| 10 |
Per bug #566520, use experimental is being called in global scope (via |
| 11 |
detect_version -> handle_genpatches). |
| 12 |
|
| 13 |
This should NOT trigger the experimental patches being applied with |
| 14 |
USE=-experimental, but further testing is needed. |
| 15 |
|
| 16 |
X-Gentoo-Bug: #566520 |
| 17 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 18 |
|
| 19 |
eclass/kernel-2.eclass | 10 ++-------- |
| 20 |
1 file changed, 2 insertions(+), 8 deletions(-) |
| 21 |
|
| 22 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 23 |
index 1a508f1..c622323 100644 |
| 24 |
--- a/eclass/kernel-2.eclass |
| 25 |
+++ b/eclass/kernel-2.eclass |
| 26 |
@@ -160,15 +160,9 @@ handle_genpatches() { |
| 27 |
if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then |
| 28 |
use_cond_start="experimental? ( " |
| 29 |
use_cond_end=" )" |
| 30 |
- |
| 31 |
- if use experimental ; then |
| 32 |
- UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" |
| 33 |
- debug-print "genpatches tarball: $tarball" |
| 34 |
- fi |
| 35 |
- else |
| 36 |
- UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" |
| 37 |
- debug-print "genpatches tarball: $tarball" |
| 38 |
fi |
| 39 |
+ UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" |
| 40 |
+ debug-print "genpatches tarball: $tarball" |
| 41 |
GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}" |
| 42 |
done |
| 43 |
} |
Archives