summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2015-06-26 22:32:49 +0000
committerMike Pagano <mpagano@gentoo.org>2015-06-26 22:32:49 +0000
commit37e58e6e42196c32aab57e0f76be75142e72c867 (patch)
tree568be91195626986ae40e23c21dba36e0fefd498 /eclass/kernel-2.eclass
parentRevision bump adds patch by Brian Evans <grknight@gentoo.org>, fixes a crash ... (diff)
downloadhistorical-37e58e6e42196c32aab57e0f76be75142e72c867.tar.gz
historical-37e58e6e42196c32aab57e0f76be75142e72c867.tar.bz2
historical-37e58e6e42196c32aab57e0f76be75142e72c867.zip
Add the option to include the kdbus patchset into gentoo-sources. Default is not to include it.
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass9
1 files changed, 7 insertions, 2 deletions
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