reproducible: use sourcepackages

2 files changed, 15 insertions, 15 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 1926554c..4e2e4bd2 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -19,30 +19,30 @@ COUNT_GOOD=0
 COUNT_BAD=0
 GOOD=""
 BAD=""
-for PACKAGE in "$@" ; do
+for SRCPACKAGE in "$@" ; do
 	let "COUNT_TOTAL=COUNT_TOTAL+1"
 	rm b1 b2 -rf
-	apt-get source --download-only ${PACKAGE} || true
-	if $(sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc) ; then
+	apt-get source --download-only ${SRCPACKAGE} || true
+	if $(sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${SRCPACKAGE}_*.dsc) ; then
 		mkdir b1 b2
-		dcmd cp /var/cache/pbuilder/result/${PACKAGE}_*.changes b1
-		sudo dcmd rm /var/cache/pbuilder/result/${PACKAGE}_*.changes
-		sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc
-		dcmd cp /var/cache/pbuilder/result/${PACKAGE}_*.changes b2
-		sudo dcmd rm /var/cache/pbuilder/result/${PACKAGE}_*.changes
-		cat b1/${PACKAGE}_*.changes
+		dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_*.changes b1
+		sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_*.changes
+		sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${SRCPACKAGE}_*.dsc
+		dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_*.changes b2
+		sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_*.changes
+		cat b1/${SRCPACKAGE}_*.changes
 		TMPFILE=$(mktemp)
 		./misc.git/diffp b1/*.changes b2/*.changes | tee ${TMPFILE}
 		if $(grep -qv '^\*\*\*\*\*' ${TMPFILE}) ; then
-			figlet ${PACKAGE}
+			figlet ${SRCPACKAGE}
 			echo
-			echo "${PACKAGE} build successfull."
+			echo "${SRCPACKAGE} build successfull."
 			let "COUNT_GOOD=COUNT_GOOD+1"
-			GOOD="${PACKAGE} ${GOOD}"
+			GOOD="${SRCPACKAGE} ${GOOD}"
 		else
-			echo "Warning: ${PACKAGE} failed to build reproducible."
+			echo "Warning: ${SRCPACKAGE} failed to build reproducible."
 			let "COUNT_BAD=COUNT_BAD+1"
-			GOOD="${PACKAGE} ${BAD}"
+			GOOD="${SRCPACKAGE} ${BAD}"
 		fi
 		rm b1 b2 ${TMPFILE} -rf
 	fi
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index a5f33911..c5233cf9 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -66,5 +66,5 @@
             my_shell: '/srv/jenkins/bin/reproducible_build.sh acl adduser base-files base-passwd bash binutils bsdmainutils bsdutils build-essential bzip2 coreutils cpp cpp-4.9 dash debconf debhelper debianutils dh-buildinfo diffutils dmsetup dpkg dpkg-dev e2fslibs e2fsprogs file findutils g++ g++-4.9 gcc gcc-4.9 gcc-4.9-base gettext gettext-base grep groff-base gzip hostname init initscripts insserv intltool-debian libacl1 libasan1 libasprintf0c2 libatomic1 libattr1 libaudit1 libaudit-common libblkid1 libbz2-1.0 libc6 libc6-dev libcap2 libcap2-bin libc-bin libc-dev-bin libcilkrts5 libcloog-isl4 libcomerr2 libcroco3 libcryptsetup4 libdb5.3 libdbus-1-3 libdebconfclient0 libdevmapper1.02.1 libdpkg-perl libffi6 libgcc1 libgcc-4.9-dev libgcrypt11 libgcrypt20 libgdbm3 libglib2.0-0 libgmp10 libgomp1 libgpg-error0 libintl-perl libisl10 libitm1 libkmod2 liblzma5 libmagic1 libmount1 libmpc3 libmpfr4 libncurses5 libncurses5-dev libncursesw5 libpam0g libpam-modules libpam-modules-bin libpam-runtime libpcre3 libpipeline1 libprocps3 libquadmath0 libselinux1 libsemanage1 libsemanage-common libsepol1 libss2 libstdc++-4.9-dev libstdc++6 libsystemd-journal0 libsystemd-login0 libtext-unidecode-perl libtimedate-perl libtinfo5 libtinfo-dev libubsan0 libudev1 libunistring0 libustr-1.0-1 libuuid1 libwrap0 libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux-libc-dev login lsb-base make man-db mawk mount ncurses-base ncurses-bin passwd patch perl perl-base perl-modules po-debconf procps sed sensible-utils startpar systemd systemd-sysv sysvinit-utils sysv-rc tar texinfo tzdata ucf udev util-linux xz-utils zlib1g'
         - '{name}_build_build-essential':
             my_description: 'Reproducible build all packages build-essential depends on.'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh libc6-dev gcc g++ make dpkg-dev'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh eglibc gcc-defaults make-dfsg dpkg'