diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-06-26 22:32:49 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-06-26 22:32:49 +0000 |
| commit | 8d5cd148c194c88266e7ae41fb519148eb8e87bc (patch) | |
| tree | 1baf0d7f4aa79284f34453c792772bd2c0f41a83 /eclass | |
| parent | Revision bump adds patch by Brian Evans <grknight@gentoo.org>, fixes a crash ... (diff) | |
| download | gentoo-2-8d5cd148c194c88266e7ae41fb519148eb8e87bc.tar.gz gentoo-2-8d5cd148c194c88266e7ae41fb519148eb8e87bc.tar.bz2 gentoo-2-8d5cd148c194c88266e7ae41fb519148eb8e87bc.zip | |
Add the option to include the kdbus patchset into gentoo-sources. Default is not to include it.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cb18623c8040..725e9d5333f8 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.1685 2015/06/26 20:43:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1686 2015/06/26 22:32:49 mpagano Exp $ + + 26 Jun 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: + Add the option to include the kdbus patchset into gentoo-sources. Default is + not to include it. 26 Jun 2015; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Remove emul-linux-x86 hack, since emul-linux-x86 is no more. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 8beeac62ebad..c8c2b586e140 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.305 2015/05/30 16:09:05 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.306 2015/06/26 22:32:49 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -449,7 +449,7 @@ if [[ ${ETYPE} == sources ]]; then SLOT="${PVR}" DESCRIPTION="Sources based on the Linux Kernel." - IUSE="symlink build" + IUSE="symlink build kdbus" # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]] ; then @@ -1013,6 +1013,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 |