Merge branch 'master' into deploy.spirit

* master:
  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 (file)
index 0000000..d3febb3
--- /dev/null
+++ b/etc/apt-conf.d/90local
@@ -0,0 +1,5 @@
+### -*-conf-*-
+
+Acquire {
+       http::Proxy "http://localhost:3142/";
+}

diff --git a/etc/aptsrc.local.conf b/etc/aptsrc.local.conf
new file mode 100644 (file)
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 (symlink)
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 (file)
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