changeset 973:cfeaae1c55ed

Allow patchdir to be overridden.
author Rob Landley <rob@landley.net>
date Fri, 05 Feb 2010 17:47:59 -0600
parents cfa6262528f3
children 51a8a0076c9d
files sources/functions.sh sources/include.sh
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/sources/functions.sh	Fri Feb 05 10:33:06 2010 -0600
+++ b/sources/functions.sh	Fri Feb 05 17:47:59 2010 -0600
@@ -227,7 +227,7 @@
   SHALIST=$(cat "$SHA1FILE" 2> /dev/null)
   if [ ! -z "$SHALIST" ]
   then
-    for i in "$SHA1TAR" $(sha1file "${SOURCES}/patches/${PACKAGE}"-* 2>/dev/null)
+    for i in "$SHA1TAR" $(sha1file "$PATCHDIR/${PACKAGE}"-* 2>/dev/null)
     do
       # Is this sha1 in the file?
       if [ -z "$(echo "$SHALIST" | sed -n "s/$i/$i/p" )" ]
@@ -263,7 +263,7 @@
 
   # Apply any patches to this package
 
-  ls "${SOURCES}/patches/${PACKAGE}"-* 2> /dev/null | sort | while read i
+  ls "$PATCHDIR/${PACKAGE}"-* 2> /dev/null | sort | while read i
   do
     if [ -f "$i" ]
     then
--- a/sources/include.sh	Fri Feb 05 10:33:06 2010 -0600
+++ b/sources/include.sh	Fri Feb 05 17:47:59 2010 -0600
@@ -18,6 +18,7 @@
 TOP=`pwd`
 export SOURCES="$TOP/sources"
 export SRCDIR="$TOP/packages"
+export PATCHDIR="$SOURCES/patches"
 export BUILD="$TOP/build"
 export HOSTTOOLS="$BUILD/host"
 export WRAPDIR="$BUILD/wrapdir"