Commit d8db001f authored by intrigeri's avatar intrigeri

Rename APT_SNAPSHOT_SERIALS → APT_SNAPSHOTS_SERIALS (refs: #15107)

This is more consistent with the naming of the corresponding
apt-snapshots-serials* scripts.
parent 19c65b7a
......@@ -34,7 +34,7 @@ STABLE_BRANCH_NAMES = ['stable', 'testing']
EXPORTED_VARIABLES = [
'MKSQUASHFS_OPTIONS',
'APT_SNAPSHOT_SERIALS',
'APT_SNAPSHOTS_SERIALS',
'TAILS_BUILD_FAILURE_RESCUE',
'TAILS_DATE_OFFSET',
'TAILS_MERGE_BASE_BRANCH',
......@@ -55,7 +55,7 @@ INTERNAL_HTTP_PROXY = "http://#{VIRTUAL_MACHINE_HOSTNAME}:3142"
ENV['ARTIFACTS'] ||= '.'
ENV['APT_SNAPSHOT_SERIALS'] ||= ''
ENV['APT_SNAPSHOTS_SERIALS'] ||= ''
class CommandError < StandardError
attr_reader :status, :stderr
......
......@@ -101,9 +101,9 @@ RUN_LB_CONFIG="lb config noauto"
$RUN_LB_CONFIG --distribution stretch ${@}
# set up everything for time-based snapshots:
if [ -n "${APT_SNAPSHOT_SERIALS:-}" ]; then
echo "Fixing 'latest' APT snapshots serials to: ${APT_SNAPSHOT_SERIALS}."
apt-snapshots-serials prepare-build "${APT_SNAPSHOT_SERIALS}"
if [ -n "${APT_SNAPSHOTS_SERIALS:-}" ]; then
echo "Fixing 'latest' APT snapshots serials to: ${APT_SNAPSHOTS_SERIALS}."
apt-snapshots-serials prepare-build "${APT_SNAPSHOTS_SERIALS}"
else
apt-snapshots-serials prepare-build
fi
......
......@@ -7,7 +7,7 @@ set -o pipefail
BASE_URL=http://time-based.snapshots.deb.tails.boum.org/
CONFIG=config/APT_snapshots.d
SERIAL_ONLY=
APT_SNAPSHOT_SERIALS=
APT_SNAPSHOTS_SERIALS=
FREEZE_EXCEPTIONS=debian-security
get_latest_serial() {
......@@ -32,7 +32,7 @@ else
fi
if [ "$action" = "prepare-build" ]; then
if [ $# -eq 1 ]; then
APT_SNAPSHOT_SERIALS="${1}"
APT_SNAPSHOTS_SERIALS="${1}"
shift
fi
fi
......@@ -87,9 +87,9 @@ case "$action" in
rm -rf tmp/APT_snapshots.d
mkdir -p tmp
cp -r config/APT_snapshots.d tmp/
if [ "${APT_SNAPSHOT_SERIALS}" ]; then
if [ "${APT_SNAPSHOTS_SERIALS}" ]; then
$(dirname "$0")/apt-snapshots-serials-load-json \
"$APT_SNAPSHOT_SERIALS" \
"$APT_SNAPSHOTS_SERIALS" \
> tmp/cached_APT_snapshots_serials
else
$0 get-latest > tmp/cached_APT_snapshots_serials
......
......@@ -15,7 +15,7 @@ as_root_do() {
${ftp_proxy:+ftp_proxy="${ftp_proxy}"} \
${no_proxy:+no_proxy="${no_proxy}"} \
${MKSQUASHFS_OPTIONS:+MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS}"} \
${APT_SNAPSHOT_SERIALS:+APT_SNAPSHOT_SERIALS="${APT_SNAPSHOT_SERIALS}"} \
${APT_SNAPSHOTS_SERIALS:+APT_SNAPSHOTS_SERIALS="${APT_SNAPSHOTS_SERIALS}"} \
${TAILS_MERGE_BASE_BRANCH:+TAILS_MERGE_BASE_BRANCH="${TAILS_MERGE_BASE_BRANCH}"} \
${GIT_COMMIT:+GIT_COMMIT="${GIT_COMMIT}"} \
${GIT_REF:+GIT_REF="${GIT_REF}"} \
......
......@@ -106,14 +106,14 @@ You can customize the build system using two environment variables:
ARTIFACTS='/path/to/directory'
* `APT_SNAPSHOT_SERIALS` can be set to specify which [[time-based APT
* `APT_SNAPSHOTS_SERIALS` can be set to specify which [[time-based APT
snapshots|contribute/APT_repository/time-based_snapshots]]
repositories will be used as 'latest' during the build, and will set
it accordingly in the resulting ISO image if necessary. This can be
useful to reproduce an ISO build that did not use tagged APT
snapshots. The value must be JSON, for example:
APT_SNAPSHOT_SERIALS='{"torproject":"2017120803","debian-security":"2017120902","debian":"2017120903"}'
APT_SNAPSHOTS_SERIALS='{"torproject":"2017120803","debian-security":"2017120902","debian":"2017120903"}'
* To tweak other build settings, use `TAILS_BUILD_OPTIONS`,
a space-separated list of build options documented below.
......
Markdown is supported
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