Skip to content

Commit

Permalink
kernel-2.eclass: use experimental in global scope
Browse files Browse the repository at this point in the history
Per bug #566520, use experimental is being called in global scope (via
detect_version -> handle_genpatches).

This should NOT trigger the experimental patches being applied with
USE=-experimental, but further testing is needed.

X-Gentoo-Bug: #566520
Signed-off-by: Robin H. Johnson <[email protected]>
  • Loading branch information
robbat2 committed Nov 22, 2015
1 parent 867ded5 commit e4872e8
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions eclass/kernel-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,9 @@ handle_genpatches() {
if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then
use_cond_start="experimental? ( "
use_cond_end=" )"

if use experimental ; then
UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
debug-print "genpatches tarball: $tarball"
fi
else
UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
debug-print "genpatches tarball: $tarball"
fi
UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
debug-print "genpatches tarball: $tarball"
GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
done
}
Expand Down

0 comments on commit e4872e8

Please sign in to comment.