diff options
| -rw-r--r-- | eclass/ChangeLog | 8 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2e285aeea6e7..5b49490194ea 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1059 2013/11/16 13:05:11 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1060 2013/11/18 13:19:49 tomwij Exp $ + + 18 Nov 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass: + Reimplemented K_EXP_GENPATCHES_LIST patch matching by switching the LHS with + the RHS and doing much more proper matching (50 works, *_BFQ-* works, + etc...); spotted by aCOSwt on the forums, my earlier tests apparently didn't + check this properly. 16 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> wxwidgets.eclass: Cleanup. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index d9c125577e87..94c9b6bbba2f 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.289 2013/11/02 12:58:50 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.290 2013/11/18 13:19:49 tomwij Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -984,9 +984,10 @@ unipatch() { local j for j in ${KPATCH_DIR}/*/50*_*.patch*; do - if [[ ! "${K_EXP_GENPATCHES_LIST}" == *"$(basename ${j})"* ]] ; then - UNIPATCH_DROP+=" $(basename ${j})" - fi + for k in ${K_EXP_GENPATCHES_LIST} ; do + [[ "$(basename ${j})" == ${k}* ]] && continue 2 + done + UNIPATCH_DROP+=" $(basename ${j})" done fi done |