# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1251952636 18000
# Node ID a6cb42614a1d7da420a667340fbf2910d0259ef6
# Parent  0f9c421d850474b614fc79157a4cebad9a69ba72
Rename build/sources to build/packages to reduce confusion (since sources/packages got moved up to just packages, and this contains the extracted contents of that).  And use $SOURCES instead of $TOP/sources in a few places.

diff -r 0f9c421d8504 -r a6cb42614a1d sources/functions.sh
--- a/sources/functions.sh	Wed Sep 02 20:01:03 2009 -0500
+++ b/sources/functions.sh	Wed Sep 02 23:37:16 2009 -0500
@@ -5,10 +5,10 @@
   # Get target platform from first command line argument.
 
   ARCH_NAME="$1"
-  if [ ! -f "${TOP}/sources/targets/${ARCH_NAME}/settings" ]
+  if [ ! -f "${SOURCES}/targets/${ARCH_NAME}/settings" ]
   then
     echo "Supported architectures: "
-    (cd "${TOP}/sources/targets" && ls)
+    (cd "${SOURCES}/targets" && ls)
 
     exit 1
   fi
@@ -16,7 +16,7 @@
   # Read the relevant config file.
 
   ARCH="$ARCH_NAME"
-  CONFIG_DIR="${TOP}/sources/targets"
+  CONFIG_DIR="${SOURCES}/targets"
   source "${CONFIG_DIR}/${ARCH}/settings"
 
   # Which platform are we building for?
@@ -182,13 +182,13 @@
 }
 
 # Extract tarball named in $1 and apply all relevant patches into
-# "$BUILD/sources/$1".  Record sha1sum of tarball and patch files in
+# "$BUILD/packages/$1".  Record sha1sum of tarball and patch files in
 # sha1-for-source.txt.  Re-extract if tarball or patches change.
 
 function extract()
 {
   FILENAME="$1"
-  SRCTREE="${BUILD}/sources"
+  SRCTREE="${BUILD}/packages"
   SHA1FILE="$(echo "${SRCTREE}/${PACKAGE}/sha1-for-source.txt")"
 
   # Sanity check: don't ever "rm -rf /".  Just don't.
@@ -227,7 +227,7 @@
   echo -n "Extracting '${PACKAGE}'"
   # Delete the old tree (if any).  Create new empty working directories.
   rm -rf "${BUILD}/temp" "${SRCTREE}/${PACKAGE}" 2>/dev/null
-  mkdir -p "${BUILD}"/{temp,sources} || dienow
+  mkdir -p "${BUILD}"/{temp,packages} || dienow
 
   # Is it a bzip2 or gzip tarball?
   DECOMPRESS=""
@@ -504,7 +504,7 @@
     # Need to extract unstable packages to determine source control version.
 
     EXTRACT_ONLY=1 setupfor "$1" >&2
-    DIR="${BUILD}/sources/alt-$1"
+    DIR="${BUILD}/packages/alt-$1"
 
     if [ -d "$DIR/.svn" ]
     then