Commit cb071818 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Debian live: be more verbose



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 268e41c7
...@@ -85,6 +85,8 @@ cleanup() { ...@@ -85,6 +85,8 @@ cleanup() {
# #
# main: follow https://wiki.debian.org/ReproducibleInstalls/LiveImages # main: follow https://wiki.debian.org/ReproducibleInstalls/LiveImages
# #
# Randomize start time
delay_start
# Argument 1 = image type # Argument 1 = image type
export CONFIGURATION="$1" export CONFIGURATION="$1"
...@@ -97,6 +99,7 @@ if [ -z "${CONFIGURATION}" -o -z "${DEBIAN_VERSION}" ]; then ...@@ -97,6 +99,7 @@ if [ -z "${CONFIGURATION}" -o -z "${DEBIAN_VERSION}" ]; then
output_echo "Error: Bad command line arguments." output_echo "Error: Bad command line arguments."
exit 1 exit 1
fi fi
output_echo "Info: Building Debian live-build for $CONFIGURATION / $DEBIAN_VERSION"
# Configuration option: Select the server for the repository # Configuration option: Select the server for the repository
# Allowed values: # Allowed values:
...@@ -108,6 +111,7 @@ fi ...@@ -108,6 +111,7 @@ fi
export REPOSERVER=auto export REPOSERVER=auto
if [ "${REPOSERVER}" == "auto" ]; then if [ "${REPOSERVER}" == "auto" ]; then
output_echo "Info: Detecting whether to use snapshot.notset.fr or deb.debian.org"
set +e # We are interested in the return value set +e # We are interested in the return value
wget --quiet --no-hsts http://snapshot.notset.fr/mr/timestamp/debian/latest --output-document latest wget --quiet --no-hsts http://snapshot.notset.fr/mr/timestamp/debian/latest --output-document latest
RETURNVALUE=$? RETURNVALUE=$?
...@@ -131,9 +135,6 @@ else ...@@ -131,9 +135,6 @@ else
export WGET_OPTIONS=--quiet export WGET_OPTIONS=--quiet
fi fi
# Randomize start time
delay_start
# Generate and use an isolated workspace # Generate and use an isolated workspace
export PROJECTNAME="live-build" export PROJECTNAME="live-build"
mkdir -p /srv/workspace/live-build mkdir -p /srv/workspace/live-build
...@@ -142,6 +143,7 @@ cd ${BUILDDIR} ...@@ -142,6 +143,7 @@ cd ${BUILDDIR}
export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t ${PROJECTNAME}-${CONFIGURATION}-${DEBIAN_VERSION}-XXXXXXXX) # accessible in schroots, used to compare results export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t ${PROJECTNAME}-${CONFIGURATION}-${DEBIAN_VERSION}-XXXXXXXX) # accessible in schroots, used to compare results
# Fetch the rebuild script (and nothing else) # Fetch the rebuild script (and nothing else)
output_echo "Fetching the rebuild script."
git clone https://salsa.debian.org/live-team/live-build.git rebuild_script --no-checkout --depth 1 git clone https://salsa.debian.org/live-team/live-build.git rebuild_script --no-checkout --depth 1
cd rebuild_script cd rebuild_script
git checkout HEAD test/rebuild.sh git checkout HEAD test/rebuild.sh
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment