mpagano 15/06/26 22:32:49 Modified: ChangeLog kernel-2.eclass Log: Add the option to include the kdbus patchset into gentoo-sources. Default is not to include it.
Revision Changes Path 1.1686 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1685&r2=1.1686 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1685 retrieving revision 1.1686 diff -u -r1.1685 -r1.1686 --- ChangeLog 26 Jun 2015 20:43:13 -0000 1.1685 +++ ChangeLog 26 Jun 2015 22:32:49 -0000 1.1686 @@ -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 <mpag...@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 <mgo...@gentoo.org> multilib-build.eclass: Remove emul-linux-x86 hack, since emul-linux-x86 is no more. 1.306 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.305&r2=1.306 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- kernel-2.eclass 30 May 2015 16:09:05 -0000 1.305 +++ kernel-2.eclass 26 Jun 2015 22:32:49 -0000 1.306 @@ -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 @@ 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_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
