| 1 |
mpagano 15/06/27 17:41:20 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Fix conditional bug for UNIPATCH_DROP |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1690 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1689&r2=1.1690 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1689 |
| 18 |
retrieving revision 1.1690 |
| 19 |
diff -u -r1.1689 -r1.1690 |
| 20 |
--- ChangeLog 27 Jun 2015 17:27:15 -0000 1.1689 |
| 21 |
+++ ChangeLog 27 Jun 2015 17:41:20 -0000 1.1690 |
| 22 |
@@ -1,6 +1,9 @@ |
| 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.1689 2015/06/27 17:27:15 mpagano Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27 17:41:20 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 27 Jun 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Fix conditional bug for UNIPATCH_DROP |
| 30 |
|
| 31 |
27 Jun 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
| 32 |
Fix for kdbus. Thanks to Arfrever. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.310 eclass/kernel-2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.309&r2=1.310 |
| 41 |
|
| 42 |
Index: kernel-2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 45 |
retrieving revision 1.309 |
| 46 |
retrieving revision 1.310 |
| 47 |
diff -u -r1.309 -r1.310 |
| 48 |
--- kernel-2.eclass 27 Jun 2015 17:27:15 -0000 1.309 |
| 49 |
+++ kernel-2.eclass 27 Jun 2015 17:41:20 -0000 1.310 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2015 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.309 2015/06/27 17:27:15 mpagano Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.310 2015/06/27 17:41:20 mpagano Exp $ |
| 55 |
|
| 56 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 57 |
# series of kernel with back-compatibility for 2.4 |
| 58 |
@@ -1022,10 +1022,12 @@ |
| 59 |
fi |
| 60 |
|
| 61 |
# if kdbus use flag is not set, drop the kdbus patch |
| 62 |
- if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]] && ! use kdbus; then |
| 63 |
- UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" |
| 64 |
+ if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]]; then |
| 65 |
+ if ! has kdbus ${IUSE} || ! use kdbus; then |
| 66 |
+ UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" |
| 67 |
+ fi |
| 68 |
fi |
| 69 |
- fi |
| 70 |
+ fi |
| 71 |
done |
| 72 |
|
| 73 |
#populate KPATCH_DIRS so we know where to look to remove the excludes |
Archives