From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 8 Jun 2020 19:01:42 +0000 (+0100)
Subject: Merge branch 'master' into deploy
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/e46b83564762947004b1eeea5b38ff50766a3e82?hp=a02fd5c0d74688a56a909b5ab5ae5eed4adf97fb

Merge branch 'master' into deploy

* master:
  Makefile: Use buster's Qemu on stretch.
  Makefile, bin/chroot-maint: Allow source distribution selection for Qemu.
  bin/chroot-maint: Add missing format argument to diagnostic.
  Makefile, bin/chroot-maint: Keep `/usr/local/include' mostly empty.
  etc/sbuild.conf.in: Don't run complicated Debian testing by default.
  Makefile: Add a new thing for running arbitrary commands.
  Makefile: Change the tag for maintenance to be `MAINT'.
  Makefile: Fix `squote' to have the right number of `\'s.
  bin/chroot-maint: Run `ldconfig' after an update.
  bin/chroot-maint: Fix mistakenly indented file-contents literals.
  src/jobclient.c: Cope if the jobserver pipe is set nonblocking.
  bin/chroot-maint: Force `--no-merged-usr'.
  bin/chroot-maint: Update the path correctly when following a symlink.
  bin/chroot-maint: Don't forget to copy symlinks to directories.
---

diff --git a/etc/apt-conf.d/90local b/etc/apt-conf.d/90local
new file mode 100644
index 0000000..d69c64c
--- /dev/null
+++ b/etc/apt-conf.d/90local
@@ -0,0 +1,5 @@
+### -*-conf-*-
+
+Acquire {
+	http::Proxy "http://universe.distorted.org.uk:3142/";
+}
diff --git a/etc/aptsrc.local.conf b/etc/aptsrc.local.conf
new file mode 100644
index 0000000..369b2b3
--- /dev/null
+++ b/etc/aptsrc.local.conf
@@ -0,0 +1,4 @@
+### -*-conf-*-
+
+subscribe
+	distorted : experimental
diff --git a/etc/aptsrc.site.conf b/etc/aptsrc.site.conf
new file mode 120000
index 0000000..96d10a9
--- /dev/null
+++ b/etc/aptsrc.site.conf
@@ -0,0 +1 @@
+/etc/apt/aptsrc.conf
\ No newline at end of file
diff --git a/local.mk b/local.mk
new file mode 100644
index 0000000..e903917
--- /dev/null
+++ b/local.mk
@@ -0,0 +1,11 @@
+### -*-makefile-*-
+
+APTSRC = etc/aptsrc.site.conf etc/aptsrc.local.conf
+TOOLSARCH = amd64
+
+SCHROOT_COPYFILES += /etc/apt/trusted.gpg.d/distorted.gpg
+
+NATIVE_ARCHS = i386 amd64
+FOREIGN_ARCHS = armel armhf arm64
+
+LOCAL = /usr/local.schroot