reproducible: more progress

3 files changed, 34 insertions, 15 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 641a46d7..e8733435 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -6,13 +6,26 @@
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
-PACKAGE=$1
-apt-get source --download-only ${PACKAGE}
-sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc
-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
+if [ -d misc.git ] ; then
+	cd misc.git
+	git pull
+	cd ..
+else
+	git clone git://git.debian.org/git/reproducible/misc.git misc.git
+fi
 
+for PACKAGE in "$@" ; do
+	rm b1 b2 -rf
+	apt-get source --download-only ${PACKAGE}
+	sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc
+	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
+
+	./misc.git/diffp b1/*.changes b2/*.changes
+
+	rm b1 b2 -rf
+done
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 38e0240c..6dbb9965 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -36,12 +36,13 @@
     publishers:
       - email:
           recipients: 'jenkins+sid-reproducible holger@layer-acht.org' # FIXME add lunar here again
-    scm:
-      - git:
-          url: 'git://git.debian.org/git/reproducible/misc.git'
-          branches:
-            - master
 
+- job-template:
+    defaults: reproducible
+    name: '{name}_build_core_fail'
+    publishers:
+      - email:
+          recipients: 'jenkins+sid-reproducible holger@layer-acht.org' # FIXME add lunar here again
 
 - project:
     name: reproducible
@@ -51,5 +52,9 @@
             my_shell: '/srv/jenkins/bin/reproducible_setup.sh'
         - '{name}_build_core':
             my_description: 'Build one package with pbuilder so far....'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh acl'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh lsb'
+        - '{name}_build_core_fail':
+            my_description: 'Build one package with pbuilder so far....'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh lsof'
+            #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'
 
diff --git a/update_jdn.sh b/update_jdn.sh
index 4efe8bac..1685844b 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -28,6 +28,7 @@ done
 sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin munin-plugins-extra calamaris visitors procmail libjson-rpc-perl libfile-touch-perl zutils ip2host \
 	build-essential python-setuptools \
 	debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging gocr guestmount schroot
+	unzip python-hachoir-metadata ghc
 sudo apt-get install -t wheezy-backports qemu
 explain "Packages installed."