summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJohn Mylchreest <johnm@gentoo.org>2004-08-25 22:53:24 +0000
committerJohn Mylchreest <johnm@gentoo.org>2004-08-25 22:53:24 +0000
commit80d6320fba2fc14066bd4883dcb0f64e5b8eec00 (patch)
treed37932c0f308dbe1873462c30196376d4b448d3a /eclass
parentStable on alpha, bug 59419. (diff)
downloadhistorical-80d6320fba2fc14066bd4883dcb0f64e5b8eec00.tar.gz
historical-80d6320fba2fc14066bd4883dcb0f64e5b8eec00.tar.bz2
historical-80d6320fba2fc14066bd4883dcb0f64e5b8eec00.zip
fixes bug 61487
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kernel-2.eclass12
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index d2cd9bb51f63..251702e11441 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.42 2004/08/25 20:44:54 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.43 2004/08/25 22:53:24 johnm Exp $
# kernel.eclass rewrite for a clean base regarding the 2.6 series of kernel
# with back-compatibility for 2.4
@@ -466,6 +466,7 @@ unipatch() {
#populate KPATCH_DIRS so we know where to look to remove the excludes
x=${KPATCH_DIR}
KPATCH_DIR=""
+ LC_ALL="C"
for i in $(find ${x} -type d | sort -n)
do
KPATCH_DIR="${KPATCH_DIR} ${i}"
@@ -487,10 +488,9 @@ unipatch() {
done
# and now, finally, we patch it :)
- LC_ALL="C"
for x in ${KPATCH_DIR}
do
- for i in $(find ${x} -maxdepth 1 -iregex ".*\.patch[0-9]*" -or -iname "*.diff" | sort -n)
+ for i in $(find ${x} -maxdepth 1 -iname "*.patch*" -or -iname "*.diff" | sort -n)
do
STDERR_T="${T}/${i/*\//}"
STDERR_T="${STDERR_T/.patch*/.err}"
@@ -535,6 +535,12 @@ unipatch() {
fi
done
done
+
+ # clean up KPATCH_DIR's - fixes bug #53610
+ for x in ${KPATCH_DIR}
+ do
+ rm -Rf ${x}
+ done
unset LC_ALL
}