changeset 988:30e4bab11f9e

Rename SKIP_STAGE_TARBALLS to NO_STAGE_TARBALLS (for consistency), and make system-image.sh use it instead of doing it by hand.
author Rob Landley <rob@landley.net>
date Wed, 24 Feb 2010 10:31:10 -0600
parents b6d7a815e47a
children 93830ce35f85
files config sources/functions.sh system-image.sh
diffstat 3 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/config	Wed Feb 24 10:17:43 2010 -0600
+++ b/config	Wed Feb 24 10:31:10 2010 -0600
@@ -37,7 +37,7 @@
 # You can set it to ext2, initramfs, or squashfs.  It defaults to squashfs
 # if blank.
 
-# export SYSIMAGE_TYPE=ext2
+# export SYSIMAGE_TYPE=squashfs
 
 # Size of writeable HDA image (if any), defaults to 64 megs
 
@@ -75,7 +75,7 @@
 
 # Don't create tarballs at the end of each stage.
 
-# export SKIP_STAGE_TARBALLS=1
+# export NO_STAGE_TARBALLS=1
 
 # Tell the linux kernel, uClibc, and busybox to show the actual build commands
 # instead of pretty-print output.
--- a/sources/functions.sh	Wed Feb 24 10:17:43 2010 -0600
+++ b/sources/functions.sh	Wed Feb 24 10:31:10 2010 -0600
@@ -593,7 +593,7 @@
   cd "$BUILD" || dienow
   link_arch_name $STAGE_NAME-{$ARCH,$ARCH_NAME}
 
-  if [ -z "$SKIP_STAGE_TARBALLS" ]
+  if [ -z "$NO_STAGE_TARBALLS" ]
   then
     echo -n creating "$STAGE_NAME-${ARCH}".tar.bz2
 
--- a/system-image.sh	Wed Feb 24 10:17:43 2010 -0600
+++ b/system-image.sh	Wed Feb 24 10:31:10 2010 -0600
@@ -30,7 +30,6 @@
 blank_tempdir "$STAGE_DIR"
 blank_tempdir "$WORK"
 
-
 [ -z "$SYSIMAGE_TYPE" ] && SYSIMAGE_TYPE=squashfs
 
 USRDIR=""
@@ -190,10 +189,6 @@
 
 # Tar it up.
 
-if [ -z "$SKIP_STAGE_TARBALLS" ]
-then
-  tar -cvj -f "$BUILD"/system-image-$ARCH_NAME.tar.bz2 \
-    -C "$BUILD" system-image-$ARCH_NAME || dienow
-fi
+ARCH="$ARCH_NAME" create_stage_tarball
 
 echo -e "=== Packaging complete\e[0m"