summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2020-03-19 13:09:32 -0400
committerTheodore Ts'o <tytso@mit.edu>2020-03-19 13:09:32 -0400
commit9d00b9e7e647a4aeaec5e73630d9a667d53548f5 (patch)
treef5cee92caad883a881ddc2f176c63d91c69afc69
parentb8ebbd46475b06312994fe8b63736e07a10d2d04 (diff)
downloadxfstests-bld-9d00b9e7e647a4aeaec5e73630d9a667d53548f5.tar.gz
build-all-archies: build root_fs.img and root_fs.tar.gz for all architectures
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rwxr-xr-xbuild-all-arches14
-rw-r--r--build_config.sh1
2 files changed, 3 insertions, 12 deletions
diff --git a/build-all-arches b/build-all-arches
index 9f803a2c..1e4685bd 100755
--- a/build-all-arches
+++ b/build-all-arches
@@ -69,7 +69,6 @@ for i in "${ARCH_LIST[@]}" ; do
>> $BUILD_DIR/config.custom
case $i in
arm*)
- echo OUT_TAR=yes >> $BUILD_DIR/config.custom
echo export ACCEL_BIN=/usr/local/bin-accel \
>> $BUILD_DIR/config.custom
;;
@@ -80,17 +79,8 @@ for i in "${ARCH_LIST[@]}" ; do
echo "Build of $i failed!"
exit 1
fi
- case $i in
- arm*)
- fn=root_fs.tar.gz
- artifact=root_fs.$i.tar.gz
- ;;
- *)
- fn=root_fs.img
- artifact=root_fs.img.$i
- ;;
- esac
- cp $BUILD_DIR/kvm-xfstests/test-appliance/$fn out_dir/$artifact
+ cp $BUILD_DIR/kvm-xfstests/test-appliance/root_fs.tar.gz out_dir/root_fs.$i.tar.gz
+ cp $BUILD_DIR/kvm-xfstests/test-appliance/root_fs.img out_dir/root_fs.img.$i
cp $BUILD_DIR/xfstests.tar.gz out_dir/xfstests-$i.tar.gz
cp $BUILD_DIR/xfstests/git-versions out_dir/git-versions-$i
if test ! -f out_dir/README ; then
diff --git a/build_config.sh b/build_config.sh
index 64acd0e0..ea0d14d8 100644
--- a/build_config.sh
+++ b/build_config.sh
@@ -42,4 +42,5 @@ export CCACHE_COMPRESS=t
BUILD_ENV="schroot -c $CHROOT --"
SUDO_ENV="schroot -c $CHROOT -u root --"
+OUT_TAR="both"
gen_image_args="--networking"