summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-27 17:40:49 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-27 17:40:49 +0100
commit1492b1ce8736568b3171ca355700baac6c3a2072 (patch)
treed9d86dadb2b29ea64c5139e238dfef264a66c2ed /bin
parente4d27360fd538b35c90d9267c03d7c4cbee19109 (diff)
downloadjenkins.debian.net-1492b1ce8736568b3171ca355700baac6c3a2072.tar.xz
reproducible: fixup experimental pbuilder base.tgz creation
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_setup_pbuilder.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 66c37f67..bf93eb3b 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -23,11 +23,6 @@ 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
@@ -62,7 +57,6 @@ 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
-$EXTRA
apt-get update
apt-get install -y $@
echo
@@ -88,7 +82,8 @@ setup_pbuilder() {
LOG=$(mktemp)
if [ "$SUITE" = "experimental" ] ; then
SUITE=sid
- PACKAGES="experimental $PACKAGES"
+ echo "echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list" > ${TMPFILE}
+ echo "echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list" >> ${TMPFILE}
fi
create_setup_tmpfile ${TMPFILE} "${PACKAGES}"
sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE