# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1167454385 18000
# Node ID 38e7e0cc3b9f715c5801ec635afccd760a014938
# Parent  752ca43084d754f89e8284cf88895c120797fa11
Build mksquashfs in the non-short cross-compiler, and use it at the end of
make mini-native on the tools directory.  Also tar up mini-native, and put
both the cross-compiler and mini-native tarballs in the build directory.
and

diff -r 752ca43084d7 -r 38e7e0cc3b9f cross-compiler.sh
--- a/cross-compiler.sh	Fri Dec 29 20:00:27 2006 -0500
+++ b/cross-compiler.sh	Fri Dec 29 23:53:05 2006 -0500
@@ -85,6 +85,13 @@
 if [ -z "${BUILD_SHORT}" ]
 then
 
+# Build squashfs
+setupfor squashfs
+cd squashfs-tools &&
+make &&
+cp mksquashfs unsquashfs "${CROSS}/bin" &&
+$CLEANUP squashfs*
+
 # Build qemu
 setupfor qemu &&
 ./configure --disable-gcc-check --prefix="${CROSS}" &&
@@ -141,10 +148,9 @@
 #  "${ARCH}-strip" "$i" 2> /dev/null
 #done
 
-echo -n creating cross-compiler-"${ARCH}".tar.bz2 &&
-cd "${TOP}"
-{ tar cjvCf build cross-compiler-"${ARCH}".tar.bz2 cross-compiler-"${ARCH}" ||
-  dienow
+echo -n creating "build/cross-compiler-${ARCH}".tar.bz2 &&
+cd "${BUILD}"
+{ tar cjvf "cross-compiler-${ARCH}".tar.bz2 cross-compiler-"${ARCH}" || dienow
 } | dotprogress
 
 [ $? -ne 0 ] && dienow
diff -r 752ca43084d7 -r 38e7e0cc3b9f mini-native.sh
--- a/mini-native.sh	Fri Dec 29 20:00:27 2006 -0500
+++ b/mini-native.sh	Fri Dec 29 23:53:05 2006 -0500
@@ -158,9 +158,18 @@
 
 fi
 
-# Packaging goes here
+# Clean up and package the result
 
 "${ARCH}-strip" "${TOOLS}"/{bin/*,sbin/*,libexec/gcc/*/*/*}
 
+cd "${BUILD}"
+echo -n "Creating tools.sqf"
+("${WORK}/mksquashfs" "${NATIVE}/tools" "tools-${ARCH}.sqf" \
+  -noappend -all-root -info || dienow) | dotprogress
+
+echo -n creating mini-native-"${ARCH}".tar.bz2 &&
+{ tar cjvf "mini-native-${ARCH}.tar.bz2" "mini-native-${ARCH}" || dienow
+} | dotprogress
+
 # Color back to normal
 echo -e "\e[0mBuild complete"