From 42134b10f916e7e42a78425440d2bdbe9ab31101 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 22 Sep 2015 18:49:15 +0200 Subject: reproducible: install disorderfs within pbuilder on all nodes --- hosts/bpi0-armhf-rb/etc/pbuilderrc | 10 +++++----- hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc | 10 +++++----- hosts/hb0-armhf-rb/etc/pbuilderrc | 10 +++++----- hosts/jenkins/etc/pbuilderrc | 4 ++-- hosts/profitbricks-build1-amd64/etc/pbuilderrc | 6 +++--- hosts/profitbricks-build2-amd64/etc/pbuilderrc | 6 +++--- hosts/profitbricks-build4-amd64/etc/pbuilderrc | 6 +++--- hosts/wbq0-armhf-rb/etc/pbuilderrc | 10 +++++----- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc index 41aedae5..623a213e 100644 --- a/hosts/bpi0-armhf-rb/etc/pbuilderrc +++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc @@ -5,11 +5,11 @@ # # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in - jenkins) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; + jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc index 41aedae5..623a213e 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc @@ -5,11 +5,11 @@ # # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in - jenkins) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; + jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc index 41aedae5..623a213e 100644 --- a/hosts/hb0-armhf-rb/etc/pbuilderrc +++ b/hosts/hb0-armhf-rb/etc/pbuilderrc @@ -5,11 +5,11 @@ # # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in - jenkins) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; + jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc index 3c330017..623a213e 100644 --- a/hosts/jenkins/etc/pbuilderrc +++ b/hosts/jenkins/etc/pbuilderrc @@ -5,8 +5,8 @@ # # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in - jenkins) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; + jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="fakeroot disorderfs" diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc index 6c3e4a21..623a213e 100644 --- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc @@ -9,7 +9,7 @@ case $HOSTNAME in bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilderrc b/hosts/profitbricks-build2-amd64/etc/pbuilderrc index 6c3e4a21..623a213e 100644 --- a/hosts/profitbricks-build2-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build2-amd64/etc/pbuilderrc @@ -9,7 +9,7 @@ case $HOSTNAME in bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc index 6c3e4a21..623a213e 100644 --- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build4-amd64/etc/pbuilderrc @@ -9,7 +9,7 @@ case $HOSTNAME in bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc index 41aedae5..623a213e 100644 --- a/hosts/wbq0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc @@ -5,11 +5,11 @@ # # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in - jenkins) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; + jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac -EXTRAPACKAGES="fakeroot" +EXTRAPACKAGES="fakeroot disorderfs" APTCACHE="" COMPRESSPROG="pigz" # unset proxy, see #780587 @@ -23,8 +23,8 @@ BINDMOUNTS="$BINDMOUNTS /sys /dev/shm" # set PATH to predictable values, see #780729 and #780725 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" -# used on reproducible builds +# used for reproducible builds tests, when doing the 2nd build if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then - PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" + PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" fi -- cgit v1.2.3-54-g00ecf