From 71f853a7db0ea805f4dd21f8418e83f6dca9610d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 5 Aug 2017 11:34:40 -0400 Subject: reproducible: Remove odc2a; it never really worked, and has been reinstalled for an experimental project. --- .../etc/pbuilder/rebuild-hooks/B01_cleanup | 17 ------- .../etc/pbuilder/rebuild-hooks/C01_cleanup | 21 -------- .../pbuilder/rebuild-hooks/D01_modify_environment | 56 ---------------------- 3 files changed, 94 deletions(-) delete mode 100755 hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup delete mode 100755 hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup delete mode 100755 hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment (limited to 'hosts/odc2a-armhf-rb/etc/pbuilder') diff --git a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup deleted file mode 100755 index 334e03a2..00000000 --- a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -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 - -# cease using disorderfs -if [ -d /tmp/disorderfs ] ; then - echo -n "Unmounting /tmp/disorderfs…" - fusermount -z -u "$BUILDDIR" - rmdir "$BUILDDIR" - mv /tmp/disorderfs "$BUILDDIR" - echo " done." -fi diff --git a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup deleted file mode 100755 index 47719ae7..00000000 --- a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -BUILDDIR="${BUILDDIR:-/tmp/buildd}" - -echo "debug output: disk usage on $(hostname) at $(date -u)" -df -h -echo - -# 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 - -# cease using disorderfs -if [ -d /tmp/disorderfs ] ; then - echo -n "Unmounting /tmp/disorderfs…" - fusermount -z -u "$BUILDDIR" - rmdir "$BUILDDIR" - mv /tmp/disorderfs "$BUILDDIR" - echo " done." -fi diff --git a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment deleted file mode 100755 index 4b4c9ab3..00000000 --- a/hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -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 - -# -# doing variations for the 2nd builds: -# -REAL_HOSTNAME=$(hostname) -echo "disorder-fs debug: Running on $REAL_HOSTNAME." - -echo "I: Changing host+domainname to test build reproducibility" >&2 -sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts -hostname i-capture-the-hostname -domainname i-capture-the-domain -echo "I: Adding a custom variable just for the fun of it..." >&2 -export CAPTURE_ENVIRONMENT="I capture the environment" - -echo "I: Changing /bin/sh to bash" >&2 -echo "dash dash/sh boolean false" | debconf-set-selections -DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash -if [ -n "$BUILDUSERNAME" ] ; then - echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2 - usermod -s /bin/bash $BUILDUSERNAME - if [ -n "$BUILDUSERGECOS" ] ; then - echo "I: Setting $BUILDUSERNAME's GECOS to $BUILDUSERGECOS" >&2 - usermod -c "$BUILDUSERGECOS" $BUILDUSERNAME - fi -fi - -# disable disorderfs due to #844498 -#exit 0 -# use disorderfs on armhf only for now -if [ "$(dpkg --print-architecture)" != "armhf" ] ; then - exit 0 -elif [ "$REAL_HOSTNAME" != "bpi0" ] ; then - exit 0 -else - echo "disorder-fs debug: bpi0, yay, enabling disorderfs now…" -fi - -# use disorderfs -if [ -x /usr/bin/disorderfs ] ; then - 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" - disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR" - echo " done." -else - echo "Warning: disorderfs not available." -fi -- cgit v1.2.3-70-g09d2