[Qa-jenkins-scm] [jenkins.debian.net] 03/04: reproducible: build/pbuilder: partially revert the last change, since moving PATH to the temporary pbuilderrc broke pbuilder

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 864b1b23b13929dccedc60a476903ddcbec01ba2
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Tue Jun 16 10:32:56 2015 +0200

    reproducible: build/pbuilder: partially revert the last change, since moving PATH to the temporary pbuilderrc broke pbuilder
---
 bin/reproducible_build.sh | 2 +-
 etc/pbuilderrc            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 05ba2d9..a1e3e0c 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -436,7 +436,7 @@ DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)"
 TZ="/usr/share/zoneinfo/Etc/GMT-14"
 LANG="fr_CH.UTF-8"
 LC_ALL="fr_CH.UTF-8"
-PATH="${PATHH:+"$PATH:"}/i/capture/the/path"
+#PATH="${PATHH:+"$PATH:"}/i/capture/the/path"  # FIXME there must be something fishy on this, since only /i/capture/the/path is in PATH inside pbuilder
 umask 0002
 EOF
 		# remember to change the sudoers setting if you change the following command
diff --git a/etc/pbuilderrc b/etc/pbuilderrc
index 4ddfd10..dc611e6 100644
--- a/etc/pbuilderrc
+++ b/etc/pbuilderrc
@@ -17,3 +17,9 @@ BINDMOUNTS="$BINDMOUNTS /sys"
 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
 
 USEDEVSHM=yes
+
+# used on reproducible builds
+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"
+fi
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git