summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-01 19:36:14 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-01 19:37:33 +0200
commit7b63623fb6ce4aa4bc0edbf399f6d65a71c3efe6 (patch)
tree6db0008d20fe64b80cfd597f27c93e3467e9bee3 /bin
parentbd23be9a30840233e5355f2f0a3fe77138cdd9da (diff)
downloadjenkins.debian.net-7b63623fb6ce4aa4bc0edbf399f6d65a71c3efe6.tar.xz
reproducible: show installed packages in base-reproducible.tgz
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh3
-rwxr-xr-xbin/reproducible_setup.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 459700e8..fb6b5d36 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -176,7 +176,8 @@ for SRCPACKAGE in ${PACKAGES} ; do
mkdir b1 b2
dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b1
sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes
- rm ${SRCPACKAGE}_*.pbuilder.log /var/lib/jenkins/userContent/pbuilder/${SRCPACKAGE}_*.pbuilder.log
+ rm ${SRCPACKAGE}_*.pbuilder.log
+ rm -f /var/lib/jenkins/userContent/pbuilder/${SRCPACKAGE}_*.pbuilder.log 2>/dev/null
sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc
dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b2
sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes
diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh
index 25570c7f..4c08af2c 100755
--- a/bin/reproducible_setup.sh
+++ b/bin/reproducible_setup.sh
@@ -12,6 +12,8 @@ echo 'deb http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.l
apt-get update
echo "Warning: Usage of --force-yes to override the apt authentication warning. Don't do this."
apt-get install --force-yes -y dpkg dpkg-dev debhelper dh-python discount
+echo
+dpkg -l
EOF
sudo rm /var/cache/pbuilder/base-reproducible.tgz || true