diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-09-23 23:31:26 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-09-23 23:31:26 +0200 |
| commit | ac53cf36d5c5f9941e1256cc31fa76f961131146 (patch) | |
| tree | 2e7dc52ce968f1fbf72e65f0868eeca21d6c61d4 | |
| parent | c9f61cb51d808248be2614580f6e050bcb4f6adc (diff) | |
| download | jenkins.debian.net-ac53cf36d5c5f9941e1256cc31fa76f961131146.tar.xz | |
reproducible: use patched discount package. dont use patched proot anymore. count good+back packages.
| -rwxr-xr-x | bin/reproducible_build.sh | 21 | ||||
| -rwxr-xr-x | bin/reproducible_setup.sh | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 07f4056f..23038937 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -14,7 +14,11 @@ else git clone git://git.debian.org/git/reproducible/misc.git misc.git fi +COUNT_TOTAL=0 +COUNT_GOOD=0 +COUNT_BAD=0 for PACKAGE in "$@" ; do + let "COUNT_TOTAL=COUNT_TOTAL+1" rm b1 b2 -rf apt-get source --download-only ${PACKAGE} sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc @@ -27,7 +31,22 @@ for PACKAGE in "$@" ; do TMPFILE=$(mktemp) ./misc.git/diffp b1/*.changes b2/*.changes | tee $TMPFILE - grep -qv '^\*\*\*\*\*' $TMPFILE && figlet ${PACKAGE}_&& echo && echo "${PACKAGE} build successfull." + if grep -qv '^\*\*\*\*\*' $TMPFILE ; then + figlet ${PACKAGE} + echo + echo "${PACKAGE} build successfull." + let "COUNT_GOOD=COUNT_GOOD+1" + else + echo "Warning: ${PACKAGE} failed to build reproducible." + let "COUNT_BAD=COUNT_BAD+1" + fi rm b1 b2 $TMPFILE -rf done + +echo +echo "$COUNT_TOTAL packages attempted to build in total." +echo "$COUNT_GOOD packages successfully built reproducible." +echo "$COUNT_GOOD packages failed to built reproducible." +echo +echo "The full list of packages: $@" diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh index 8ca78b9a..8f5348e1 100755 --- a/bin/reproducible_setup.sh +++ b/bin/reproducible_setup.sh @@ -11,7 +11,7 @@ cat > $TMPFILE <<- EOF echo 'deb http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.list.d/reproducible.list 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 proot +apt-get install --force-yes -y dpkg dpkg-dev debhelper dh-python discount EOF sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid |