summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_build.sh2
-rw-r--r--etc/pbuilderrc6
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 05ba2d9e..a1e3e0c8 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 4ddfd109..dc611e6a 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
+