From 1461dacf89f3005192b3269ecf7ea2b4553b060b Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 27 Feb 2015 17:02:53 +0100 Subject: reproducible: add support for experimental base.tgz --- bin/reproducible_setup_pbuilder.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh index 966c8167..03ba1696 100755 --- a/bin/reproducible_setup_pbuilder.sh +++ b/bin/reproducible_setup_pbuilder.sh @@ -23,6 +23,11 @@ fi create_setup_tmpfile() { TMPFILE=$1 shift + if [ "$1" = "experimental" ] ; then + EXTRA="echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list +echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list" + shift + fi cat > $TMPFILE <<- EOF # # this script is run within the pbuilder environment to further customize it @@ -57,7 +62,8 @@ Mb0BawlXZui0MNUSnZtxHMxrjejdvZdqtskHl9srB1QThH0jasmUqbQPxCnxMbf1 =X8YA -----END PGP PUBLIC KEY BLOCK-----" | apt-key add - echo 'deb http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.list.d/reproducible.list -apt-get update +$EXTRA +apt-gt update apt-get install -y $@ echo dpkg -l @@ -67,6 +73,7 @@ echo EOF } + # # setup pbuilder for reproducible builds # @@ -79,6 +86,10 @@ setup_pbuilder() { echo "$(date) - creating /var/cache/pbuilder/${NAME}.tgz now..." TMPFILE=$(mktemp) LOG=$(mktemp) + if [ "$SUITE" == "experimental" ] ; then + SUITE=sid + PACKAGES="experimental $PACKAGES" + fi create_setup_tmpfile ${TMPFILE} "${PACKAGES}" 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} @@ -95,5 +106,4 @@ setup_pbuilder() { } # 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 -- cgit v1.2.3-54-g00ecf