| 1 |
mpagano 15/06/26 22:32:49 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Add the option to include the kdbus patchset into gentoo-sources. Default is not to include it. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1686 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1685&r2=1.1686 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1685 |
| 18 |
retrieving revision 1.1686 |
| 19 |
diff -u -r1.1685 -r1.1686 |
| 20 |
--- ChangeLog 26 Jun 2015 20:43:13 -0000 1.1685 |
| 21 |
+++ ChangeLog 26 Jun 2015 22:32:49 -0000 1.1686 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26 20:43:13 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1686 2015/06/26 22:32:49 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 26 Jun 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Add the option to include the kdbus patchset into gentoo-sources. Default is |
| 30 |
+ not to include it. |
| 31 |
|
| 32 |
26 Jun 2015; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 33 |
Remove emul-linux-x86 hack, since emul-linux-x86 is no more. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.306 eclass/kernel-2.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.305&r2=1.306 |
| 42 |
|
| 43 |
Index: kernel-2.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 46 |
retrieving revision 1.305 |
| 47 |
retrieving revision 1.306 |
| 48 |
diff -u -r1.305 -r1.306 |
| 49 |
--- kernel-2.eclass 30 May 2015 16:09:05 -0000 1.305 |
| 50 |
+++ kernel-2.eclass 26 Jun 2015 22:32:49 -0000 1.306 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.305 2015/05/30 16:09:05 mpagano Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.306 2015/06/26 22:32:49 mpagano Exp $ |
| 56 |
|
| 57 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 58 |
# series of kernel with back-compatibility for 2.4 |
| 59 |
@@ -449,7 +449,7 @@ |
| 60 |
|
| 61 |
SLOT="${PVR}" |
| 62 |
DESCRIPTION="Sources based on the Linux Kernel." |
| 63 |
- IUSE="symlink build" |
| 64 |
+ IUSE="symlink build kdbus" |
| 65 |
|
| 66 |
# Bug #266157, deblob for libre support |
| 67 |
if [[ -z ${K_PREDEBLOBBED} ]] ; then |
| 68 |
@@ -1013,6 +1013,11 @@ |
| 69 |
UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" |
| 70 |
fi |
| 71 |
fi |
| 72 |
+ |
| 73 |
+ # if kdbus use flag is not set, drop the kdbus patch |
| 74 |
+ if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]] && ! use kdbus; then |
| 75 |
+ UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" |
| 76 |
+ fi |
| 77 |
fi |
| 78 |
done |
Archives