build-chroot: pin debootstrap

debootstrap bug #946783 means that the latest version on buster does not function correctly with both --unpack-tarball and --foreign. Pin an older version without this bug until it's fixed on stable.
sipb · Dec 17, 2019 · a8728be · a8728be
1 parent 516420f
commit a8728be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/build-chroot/create.sh b/build-chroot/create.sh
@@ -38,6 +38,8 @@ then
 fi
 # TODO: build our own Bazel, rather than grabbing it from Google's repo
 ./install-bazel.sh --root "${HOMEWORLD_CHROOT}"
+# TODO: remove version pinning once debootstrap bug #946783 is fixed
+./install-debootstrap.sh --root "${HOMEWORLD_CHROOT}"
 sudo chroot "${HOMEWORLD_CHROOT}" groupadd "$(id -gn)" -g "$(id -g)"
 sudo chroot "${HOMEWORLD_CHROOT}" useradd -m -u "$(id -u)" -g "$(id -g)" "$USER" -s "/bin/bash"
 sudo chroot "${HOMEWORLD_CHROOT}" pip install -U gsutil pyasn1

diff --git a/build-chroot/debootstrap-1.0.106.deb.sha256 b/build-chroot/debootstrap-1.0.106.deb.sha256
@@ -0,0 +1 @@
+14da318a90c66b9ef4be97b950bffd418033598c44f12f472d3501edec103f40  debootstrap-1.0.106.deb
diff --git a/build-chroot/install-debootstrap.sh b/build-chroot/install-debootstrap.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e -u
+
+VERSION="1.0.106"
+DEBI="20180811T145253Z"
+
+cd "$(dirname "$0")"
+curl -L -o "debootstrap-${VERSION}.deb" "http://snapshot.debian.org/archive/debian/${DEBI}/pool/main/d/debootstrap/debootstrap_${VERSION}_all.deb"
+sha256sum --check "debootstrap-${VERSION}.deb.sha256"
+sudo dpkg "$@" --install "debootstrap-${VERSION}.deb"
+echo "debootstrap hold" | sudo dpkg "$@" --set-selections
+rm "debootstrap-${VERSION}.deb"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		14da318a90c66b9ef4be97b950bffd418033598c44f12f472d3501edec103f40 debootstrap-1.0.106.deb