diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-02-27 14:40:43 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-02-27 14:40:43 +0100 |
| commit | ee656aea4fe82ebead1e8feb5bd4508a557b44f4 (patch) | |
| tree | 9a8a52ce0e3736641682a36611884dc1f97c7a74 | |
| parent | b26328f927e720961d04f0ff6fcc7d24f645b407 (diff) | |
| download | jenkins.debian.net-ee656aea4fe82ebead1e8feb5bd4508a557b44f4.tar.xz | |
reproducible: use SUITE consistently, accept SUITE as param, default to sid
| -rwxr-xr-x | bin/reproducible_setup_pbuilder.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh index 13f44763..966c8167 100755 --- a/bin/reproducible_setup_pbuilder.sh +++ b/bin/reproducible_setup_pbuilder.sh @@ -10,6 +10,13 @@ common_init "$@" # common code defining db access . /srv/jenkins/bin/reproducible_common.sh +# support different suites +if [ -z "$1" ] ; then + SUITE="sid" +else + SUITE="$1" +fi + # # create script to configure a pbuilder chroot # @@ -64,7 +71,7 @@ EOF # setup pbuilder for reproducible builds # setup_pbuilder() { - DISTRO=$1 + SUITE=$1 shift NAME=$1 shift @@ -73,7 +80,7 @@ setup_pbuilder() { TMPFILE=$(mktemp) LOG=$(mktemp) create_setup_tmpfile ${TMPFILE} "${PACKAGES}" - sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $DISTRO + sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG} echo echo "Now let's see whether the correct packages where installed..." @@ -87,8 +94,6 @@ setup_pbuilder() { echo } -for SUITE in $SUITES ; do - # FIXME: base-reproducible should be renamed to include the suite - # FIXME: DISTRO=experimental needs sid as base distro - setup_pbuilder $SUITE base-reproducible dpkg dpkg-dev debhelper -done +# FIXME: base-reproducible should be renamed to include the suite +# FIXME: SUITE=experimental needs sid as base distro +setup_pbuilder $SUITE base-reproducible dpkg dpkg-dev debhelper |