From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 21 Sep 2019 21:35:34 +0000 (+0100)
Subject: Merge branch 'master' into deploy
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/023dbf291d462662eaadd8c2976f38c4d2b7f95e?hp=0372ba78d56a891ff2452d5d1ee25928eb6b75b0

Merge branch 'master' into deploy

* master:
  etc/sbuild.conf.in: Keep failed build trees for diagnostics.
  Maintain a separate ccache directory for each target.
---

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