Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=5be09946dac2a6a29f72a6728a2a623d9b99ff01
commit 5be09946dac2a6a29f72a6728a2a623d9b99ff01
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Tue May 18 15:14:55 2010 +0200
Fpatchall: don't handled part of arch names as archs
- ie foo-pc.patch was handled as an arch patch because pc is part of ppc
- don't do this
diff --git a/source/include/util.sh b/source/include/util.sh
index 00714ae..236780c 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -662,7 +662,7 @@ Fpatchall() {
if [ -n "`echo "$i" | grep '\.patch[0-9]*$'`" -o -n "`echo "$i" | grep
'\.diff$'`" -o -n "`echo "$i" | grep '\.\(patch[0-9]*\|diff\)\.\(gz\|bz2\)$'`"
]; then
patch=`strip_url "$i"`
patcharch=`echo $patch|sed 's/.*-\([^-]\+\)\.\(diff\|patch0\?\)$/\1/'`
- if [ "$patcharch" != "$patch" ] && echo
${farc...@]}|grep -q $patcharch; then
+ if [ "$patcharch" != "$patch" ] && echo " ${farc...@]}
"|grep -q " $patcharch "; then
# filter the patch if it's not for the current arch
if [ "$patcharch" == "$CARCH" ]; then
Fpatch $patch
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
