Revert "reproducible: hosting is serious business, thanks for that too, Vagrant"

This reverts commit 6db56cf69baf0808697148bb9cf84d18d65bfe77.

9 files changed, 9 insertions, 9 deletions

diff --git a/THANKS.head b/THANKS.head
index 5183ee01..983cb10c 100644
--- a/THANKS.head
+++ b/THANKS.head
@@ -9,7 +9,7 @@
  ** 4 cores and 8 GB memory for profitbricks-build4-amd64.debian.net
  ** 3 cores and 6 GB memory for freebsd-jenkins.debian.net
  * link:https://globalsign.com[GlobalSign] in January 2015 kindly provided free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net.
- * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing and hosting four 'armhf' systems, two quad-cores with 2 GB RAM each and two dual-cores with 1 GB RAM.
+ * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing four 'armhf' systems, two quad-cores with 2 GB RAM each and two dual-cores with 1 GB RAM.
 
 === Contributors
 
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc
index 48271671..623a213e 100644
--- a/hosts/bpi0-armhf-rb/etc/pbuilderrc
+++ b/hosts/bpi0-armhf-rb/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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
index 48271671..623a213e 100644
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4pro0-armhf-rb/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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc
index 48271671..623a213e 100644
--- a/hosts/hb0-armhf-rb/etc/pbuilderrc
+++ b/hosts/hb0-armhf-rb/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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index 48271671..623a213e 100644
--- a/hosts/jenkins/etc/pbuilderrc
+++ b/hosts/jenkins/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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc
index 48271671..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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilderrc b/hosts/profitbricks-build2-amd64/etc/pbuilderrc
index 48271671..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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
index 48271671..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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc
index 48271671..623a213e 100644
--- a/hosts/wbq0-armhf-rb/etc/pbuilderrc
+++ b/hosts/wbq0-armhf-rb/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=""	# better list them in bin/reproducible_setup_pbuilder.sh
+EXTRAPACKAGES="fakeroot disorderfs"
 APTCACHE=""
 COMPRESSPROG="pigz"
 # unset proxy, see #780587