summaryrefslogtreecommitdiffstats
path: root/auto
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-07-24 22:59:50 +0200
committerTails developers <amnesia@boum.org>2014-07-24 22:59:50 +0200
commit56c42191c0620c45c7659cce16b564467bb80759 (patch)
tree6cd3e4fd1e9e3da073b73f174036065cb5bc5226 /auto
parent352a9582632002ccfea7502e5d328f8f34b73f9e (diff)
parent5bd70a9f22d9b467acf5f1500c5e4ee16d35f5ec (diff)
Merge commit '5bd70a9f22d9b467acf5f1500c5e4ee16d35f5ec' into doc/project
Diffstat (limited to 'auto')
-rwxr-xr-xauto/build13
-rwxr-xr-xauto/config4
-rwxr-xr-xauto/scripts/tails-custom-apt-sources2
3 files changed, 13 insertions, 6 deletions
diff --git a/auto/build b/auto/build
index 6c1270e..d9c1410 100755
--- a/auto/build
+++ b/auto/build
@@ -59,6 +59,7 @@ chmod -R go+rX config/chroot_local-includes/usr
chmod -R go+rx config/chroot_local-includes/usr/local/bin
chmod -R go+rx config/chroot_local-includes/usr/local/sbin
chmod -R go+rX config/chroot_local-includes/usr/share/doc/tails
+chmod -R go+rX config/chroot_local-includes/var
chmod -R go+rX config/chroot_apt
chmod -R go+rX config/chroot_sources
@@ -84,7 +85,7 @@ if GIT_REF="$(git symbolic-ref HEAD)"; then
else
GIT_CURRENT_COMMIT="$(git rev-parse HEAD)"
if GIT_TAG="$(git describe --tags --exact-match ${GIT_CURRENT_COMMIT})"; then
- CLEAN_GIT_TAG=$(echo "$GIT_TAG" | sed -e 's,/,_,g' -e 's,-rc,~rc,')
+ CLEAN_GIT_TAG=$(echo "$GIT_TAG" | tr '/-' '_~')
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_TAG}"
else
# this shouldn't reasonably happen (e.g. only if you checkout a
@@ -121,8 +122,14 @@ BUILD_LOG="${BUILD_DEST_FILENAME}.buildlog"
echo "Building $LB_BINARY_IMAGES image ${BUILD_BASENAME}..."
set -o pipefail
-if time eatmydata lb build noauto ${@} 2>&1 | tee "${BUILD_LOG}" ; then
- echo "Image was successfully created"
+time eatmydata lb build noauto ${@} 2>&1 | tee "${BUILD_LOG}"
+RET=$?
+if [ -e "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}" ]; then
+ if [ "$RET" -eq 0 ]; then
+ echo "Image was successfully created"
+ else
+ echo "Warning: image created, but lb build exited with code $RET"
+ fi
echo "Renaming generated files..."
mv -i "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}" "${BUILD_DEST_FILENAME}"
mv -i binary.packages "${BUILD_PACKAGES}"
diff --git a/auto/config b/auto/config
index 6669177..f614c9b 100755
--- a/auto/config
+++ b/auto/config
@@ -16,12 +16,12 @@ fi
RUN_LB_CONFIG="lb config noauto"
# init config/ with defaults for the target distribution
-$RUN_LB_CONFIG --distribution squeeze ${@}
+$RUN_LB_CONFIG --distribution wheezy ${@}
# set Amnesia's general options
$RUN_LB_CONFIG \
--apt-recommends false \
- --backports true \
+ --backports false \
--binary-images iso \
--binary-indices false \
--checksums none \
diff --git a/auto/scripts/tails-custom-apt-sources b/auto/scripts/tails-custom-apt-sources
index 2e3503f..ce939d1 100755
--- a/auto/scripts/tails-custom-apt-sources
+++ b/auto/scripts/tails-custom-apt-sources
@@ -57,5 +57,5 @@ else
fi
if on_topic_branch; then
- output_apt_binary_source "$(branch_name_to_suite $(current_branch))"
+ output_apt_binary_source "$(branch_name_to_suite $(current_branch))"
fi