diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-06-27 15:36:06 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-06-27 15:36:06 +0000 |
| commit | 6cfc252e38bd863b7803777b1e7d177adbbeb2e5 (patch) | |
| tree | ec4d08205114cd1c01f83961ec2264b3577f7f8e /eclass | |
| parent | Version bump (diff) | |
| download | gentoo-2-6cfc252e38bd863b7803777b1e7d177adbbeb2e5.tar.gz gentoo-2-6cfc252e38bd863b7803777b1e7d177adbbeb2e5.tar.bz2 gentoo-2-6cfc252e38bd863b7803777b1e7d177adbbeb2e5.zip | |
Add the kdbus use flag and eclass variable to the kernel-2.eclass for optional kdbus inclusion.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c99e8c784c91..14b773f2e042 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1687 2015/06/27 00:50:55 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1688 2015/06/27 15:36:06 mpagano Exp $ + + 27 Jun 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: + Add the kdbus use flag and eclass variable to the kernel-2.eclass for + optional kdbus inclusion. 27 Jun 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c75f66e79868..9bebe4b62ef5 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.307 2015/06/27 00:50:55 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.308 2015/06/27 15:36:06 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -65,6 +65,9 @@ # K_LONGTERM - If set, the eclass will search for the kernel source # in the long term directories on the upstream servers # as the location has been changed by upstream +# K_KDBUS_AVAILABLE - If set, the ebuild contains the option of installing the +# kdbus patch. This patch is not installed without the 'kdbus' +# and 'experimental' use flags. # H_SUPPORTEDARCH - this should be a space separated list of ARCH's which # can be supported by the headers ebuild @@ -451,6 +454,10 @@ if [[ ${ETYPE} == sources ]]; then DESCRIPTION="Sources based on the Linux Kernel." IUSE="symlink build" + if [[ -n K_KDBUS_AVAILABLE ]]; then + IUSE="${IUSE} kdbus" + fi + # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]] ; then # Bug #359865, force a call to detect_version if needed @@ -1013,6 +1020,11 @@ unipatch() { UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" fi fi + + # if kdbus use flag is not set, drop the kdbus patch + if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]] && ! use kdbus; then + UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" + fi fi done |