diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-07-10 10:27:09 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-10 10:27:09 +0200 |
| commit | 12430e0818ea358d5a3883be0bf4e9852d743a93 (patch) | |
| tree | 2845acaa5aa8e7270f5ccbd7e6f9e1dd666da16f | |
| parent | 4b81e627f23916f4a096a56456748a091acf4fe5 (diff) | |
| download | jenkins.debian.net-12430e0818ea358d5a3883be0bf4e9852d743a93.tar.xz | |
sync with the others…
4 files changed, 10 insertions, 4 deletions
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh index 848f481c..b1b80c0b 100755 --- a/bin/reproducible_setup_pbuilder.sh +++ b/bin/reproducible_setup_pbuilder.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org> +# Copyright 2014-2016 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 DEBUG=false diff --git a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment index 5e442552..62ae3d03 100755 --- a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment @@ -2,6 +2,8 @@ set -e +BUILDDIR="${BUILDDIR:-/tmp/buildd}" + # exit if we are in the same UTS namespace as init ( != 2nd build ) [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0 @@ -21,7 +23,7 @@ exit 0 # use disorderfs if [ -x /usr/bin/disorderfs ] ; then - echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…" + echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…" mknod -m 666 /dev/fuse c 10 229 mv "$BUILDDIR" /tmp/disorderfs mkdir "$BUILDDIR" diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment index 5e442552..62ae3d03 100755 --- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment @@ -2,6 +2,8 @@ set -e +BUILDDIR="${BUILDDIR:-/tmp/buildd}" + # exit if we are in the same UTS namespace as init ( != 2nd build ) [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0 @@ -21,7 +23,7 @@ exit 0 # use disorderfs if [ -x /usr/bin/disorderfs ] ; then - echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…" + echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…" mknod -m 666 /dev/fuse c 10 229 mv "$BUILDDIR" /tmp/disorderfs mkdir "$BUILDDIR" diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment index 5e442552..62ae3d03 100755 --- a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment @@ -2,6 +2,8 @@ set -e +BUILDDIR="${BUILDDIR:-/tmp/buildd}" + # exit if we are in the same UTS namespace as init ( != 2nd build ) [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0 @@ -21,7 +23,7 @@ exit 0 # use disorderfs if [ -x /usr/bin/disorderfs ] ; then - echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…" + echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…" mknod -m 666 /dev/fuse c 10 229 mv "$BUILDDIR" /tmp/disorderfs mkdir "$BUILDDIR" |