[26282] in Source-Commits
/svn/athena r25490 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue May 8 13:30:37 2012
Date: Tue, 8 May 2012 13:30:35 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205081730.q48HUZwU016964@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-08 13:30:35 -0400 (Tue, 08 May 2012)
New Revision: 25490
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
Make zipping the chroots optional
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2012-05-08 01:23:20 UTC (rev 25489)
+++ trunk/debathena/scripts/build-server/make-chroot 2012-05-08 17:30:35 UTC (rev 25490)
@@ -6,6 +6,12 @@
# and architecture ARCH, and sets up schroot configuration for it.
# Assumes an approx cache is running at localhost:9999.
+BZ2=0
+if [ "$1" = "-z" ]; then
+ BZ2=1
+ shift
+fi
+
set -xe
: ${CHROOTDIR=/srv}
@@ -13,7 +19,8 @@
SUITE=$1
ARCH=$2
CHROOT="${SUITE}-${ARCH}-sbuild"
-FILE="$CHROOTDIR"/"$CHROOT".tar.bz2
+FILE="$CHROOTDIR"/"$CHROOT".tar
+[ $BZ2 -eq 1 ] && FILE="${FILE}.bz2"
SIZE=4G
exittrap() { :; }
@@ -67,7 +74,9 @@
mkdir -p "$TARGET/dev/shm"
mkdir -p "$TARGET/afs"
mkdir -p "$TARGET/mit"
-(cd "$TMPDIR" && tar cjf "$FILE" --numeric-owner root)
+TAROPTS="cf"
+[ $BZ2 -eq 1 ] && TAROPTS="cjf"
+(cd "$TMPDIR" && tar "$TAROPTS" "$FILE" --numeric-owner root)
rm -rf "$TMPDIR"
exittrap() { :; }
