docker(debian-dev): re-enable sbuild.

9 files changed, 25 insertions, 21 deletions

diff --git a/docker/debian-dev/Dockerfile b/docker/debian-dev/Dockerfile
index b2a9c9c..e43764e 100644
--- a/docker/debian-dev/Dockerfile
+++ b/docker/debian-dev/Dockerfile
@@ -9,8 +9,9 @@ RUN /bootstrap/apt-source/setup.bash
 RUN /bootstrap/setup-base.bash
 RUN /bootstrap/setup-dev-tools.bash
 RUN /bootstrap/setup-dev-tools-arm64.bash
-# RUN /bootstrap/setup-sbuild.bash
-# RUN /bootstrap/setup-sbuild-arm64.bash
+RUN /bootstrap/setup-sbuild-base.bash
+RUN /bootstrap/setup-sbuild-amd64.bash
+RUN /bootstrap/setup-sbuild-arm64.bash
 
 VOLUME [ "/source", "/data" ]
 CMD [ "bash", "-l" ]
diff --git a/docker/debian-dev/bootstrap/home-dot/devscripts b/docker/debian-dev/bootstrap/home-dot/devscripts
new file mode 100644
index 0000000..a15b041
--- /dev/null
+++ b/docker/debian-dev/bootstrap/home-dot/devscripts
@@ -0,0 +1 @@
+export DGET_VERIFY=no
\ No newline at end of file
diff --git a/docker/debian-dev/bootstrap/quiltrc-dpkg b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg
index e8fc3c5..e8fc3c5 100644
--- a/docker/debian-dev/bootstrap/quiltrc-dpkg
+++ b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg
diff --git a/docker/debian-dev/bootstrap/sbuildrc b/docker/debian-dev/bootstrap/home-dot/sbuildrc
index 1a9bed4..1a9bed4 100644
--- a/docker/debian-dev/bootstrap/sbuildrc
+++ b/docker/debian-dev/bootstrap/home-dot/sbuildrc
diff --git a/docker/debian-dev/bootstrap/setup-dev-tools.bash b/docker/debian-dev/bootstrap/setup-dev-tools.bash
index 34bae8c..92f59c8 100755
--- a/docker/debian-dev/bootstrap/setup-dev-tools.bash
+++ b/docker/debian-dev/bootstrap/setup-dev-tools.bash
@@ -6,6 +6,9 @@ apt-get install -y build-essential git devscripts debhelper quilt \
     cpio kmod bc python bison flex rsync libelf-dev libssl-dev libncurses-dev dwarves
 
 cat /bootstrap/bash-profile/dev.bash >> /root/.bash_profile
-
-cp /bootstrap/quiltrc-dpkg /root/.quiltrc-dpkg
 cat /bootstrap/bash-profile/dquilt.bash >> /root/.bash_profile
+
+for f in /bootstrap/home-dot/*; do
+    filename=$(basename "$f")
+    cp "$f" "/root/.$filename"
+done
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash b/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash
new file mode 100755
index 0000000..9ee08d1
--- /dev/null
+++ b/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+set -e
+
+SBUILD_ARCH="amd64"
+SBUILD_DIST="bullseye"
+
+sbuild-createchroot --include=eatmydata --command-prefix=eatmydata --arch=${SBUILD_ARCH} ${SBUILD_DIST} /srv/chroot/${SBUILD_DIST}-${SBUILD_ARCH}-sbuild "http://$(/bootstrap/apt-source/get-domain.bash)/debian"
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash b/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash
index b176b14..5feac2d 100755
--- a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash
+++ b/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-export SBUILD_ARCH=arm64
-
-/bootstrap/setup-sbuild.bash
+SBUILD_ARCH="arm64"
+SBUILD_DIST="bullseye"
 
+sbuild-createchroot --include=eatmydata --command-prefix=eatmydata --foreign --arch=${SBUILD_ARCH} ${SBUILD_DIST} /srv/chroot/${SBUILD_DIST}-${SBUILD_ARCH}-sbuild "http://$(/bootstrap/apt-source/get-domain.bash)/debian"
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-base.bash b/docker/debian-dev/bootstrap/setup-sbuild-base.bash
new file mode 100755
index 0000000..a200d3f
--- /dev/null
+++ b/docker/debian-dev/bootstrap/setup-sbuild-base.bash
@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+
+set -e
+
+apt-get install -y sbuild schroot debootstrap
diff --git a/docker/debian-dev/bootstrap/setup-sbuild.bash b/docker/debian-dev/bootstrap/setup-sbuild.bash
deleted file mode 100755
index f9f1933..0000000
--- a/docker/debian-dev/bootstrap/setup-sbuild.bash
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env bash
-
-set -e
-
-if [[ -z "${SBUILD_ARCH}" ]]; then
-    SBUILD_ARCH="amd64"
-fi
-
-apt-get install -y sbuild schroot debootstrap
-
-cp /bootstrap/sbuildrc /root/.sbuildrc
-
-sbuild-createchroot --arch=${SBUILD_ARCH} bullseye /srv/chroot/bullseye-${SBUILD_ARCH}-sbuild "https://$(/bootstrap/apt-source/get-domain.bash)/debian"
-