summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-11-18 13:19:49 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-11-18 13:19:49 +0000
commit8227fc85c9352e7370b818e961dcd375166e377c (patch)
tree7233fb684828c2856936c80c3202f070e5fd0641 /eclass/kernel-2.eclass
parentVersion bump to fix the darn includes. (diff)
downloadgentoo-2-8227fc85c9352e7370b818e961dcd375166e377c.tar.gz
gentoo-2-8227fc85c9352e7370b818e961dcd375166e377c.tar.bz2
gentoo-2-8227fc85c9352e7370b818e961dcd375166e377c.zip
Reimplemented K_EXP_GENPATCHES_LIST patch matching by switching the LHS with the RHS and doing much more proper matching.
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass9
1 files changed, 5 insertions, 4 deletions
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