From dfb79262f43060e2828079389773345467a733fd Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 21 Nov 2023 21:50:26 +0800
Subject: docker(debian-dev): now cross-compile with sbuild should work.

---
 .../debian-dev/bootstrap/sbuild/setup-amd64.bash   |  7 ++++++
 .../bootstrap/sbuild/setup-sbuild-amd64.bash       |  8 -------
 .../bootstrap/sbuild/setup-sbuild-arm64.bash       |  8 -------
 .../bootstrap/sbuild/setup-sbuild-base.bash        |  5 -----
 .../debian-dev/bootstrap/sbuild/setup-sbuild.bash  | 11 ----------
 docker/debian-dev/bootstrap/sbuild/setup.bash      | 25 ++++++++++++++++++++++
 6 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100755 docker/debian-dev/bootstrap/sbuild/setup-amd64.bash
 delete mode 100755 docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash
 delete mode 100755 docker/debian-dev/bootstrap/sbuild/setup-sbuild-arm64.bash
 delete mode 100755 docker/debian-dev/bootstrap/sbuild/setup-sbuild-base.bash
 delete mode 100755 docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash
 create mode 100755 docker/debian-dev/bootstrap/sbuild/setup.bash

(limited to 'docker/debian-dev/bootstrap/sbuild')

diff --git a/docker/debian-dev/bootstrap/sbuild/setup-amd64.bash b/docker/debian-dev/bootstrap/sbuild/setup-amd64.bash
new file mode 100755
index 0000000..2c05e40
--- /dev/null
+++ b/docker/debian-dev/bootstrap/sbuild/setup-amd64.bash
@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+
+set -e
+
+SBUILD_ARCH="amd64"
+
+sbuild-createchroot --include=eatmydata --command-prefix=eatmydata --arch=${SBUILD_ARCH} ${SBUILD_DIST} /srv/chroot/${SBUILD_DIST}-${SBUILD_ARCH}-sbuild "${SBUILD_MIRROR}"
diff --git a/docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash
deleted file mode 100755
index 9ee08d1..0000000
--- a/docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /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/sbuild/setup-sbuild-arm64.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-arm64.bash
deleted file mode 100755
index 5feac2d..0000000
--- a/docker/debian-dev/bootstrap/sbuild/setup-sbuild-arm64.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env bash
-
-set -e
-
-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/sbuild/setup-sbuild-base.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-base.bash
deleted file mode 100755
index a200d3f..0000000
--- a/docker/debian-dev/bootstrap/sbuild/setup-sbuild-base.bash
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env bash
-
-set -e
-
-apt-get install -y sbuild schroot debootstrap
diff --git a/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash
deleted file mode 100755
index f260e5d..0000000
--- a/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env bash
-
-/bootstrap/sbuild/setup-sbuild-base.bash
-
-if [[ "$BUILD_FOR_ARCH" == "amd64" ]]; then
-    /bootstrap/sbuild/setup-sbuild-amd64.bash
-fi
-
-if [[ "$BUILD_FOR_ARCH" == "arm64" ]]; then
-    /bootstrap/sbuild/setup-sbuild-arm64.bash
-fi
diff --git a/docker/debian-dev/bootstrap/sbuild/setup.bash b/docker/debian-dev/bootstrap/sbuild/setup.bash
new file mode 100755
index 0000000..5180db6
--- /dev/null
+++ b/docker/debian-dev/bootstrap/sbuild/setup.bash
@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+
+set -e
+
+dir=$(dirname $0)
+
+. /bootstrap/func.bash
+
+apt-get install -y sbuild schroot debootstrap
+
+copy-home-dot-file sbuildrc
+
+# setup apt-cacher-ng
+apt-get install -y apt-cacher-ng
+append-bash-profile auto-start-apt-cacher.bash
+apt-cacher-ng
+export SBUILD_MIRROR="http://127.0.0.1:3142/$(/bootstrap/apt-source/get-domain.bash)/debian"
+
+export SBUILD_DIST="bullseye"
+
+"$dir/setup-amd64.bash"
+
+if [[ "$BUILD_FOR_ARCH" == "arm64" ]]; then
+    "$dir/setup-arm64.bash"
+fi
-- 
cgit v1.2.3