From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 9 May 2020 16:09:19 +0000 (+0100)
Subject: Merge branch 'master' into deploy.universe
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/07f68002d73a4121908dec71a7701b813d4e0016?hp=c7c01b125d221388f3d786e995aae4677e86dd2c

Merge branch 'master' into deploy.universe

* master:
  Makefile, bin/chroot-maint: Keep `/usr/local/include' mostly empty.
  etc/sbuild.conf.in: Don't run complicated Debian testing by default.
---

diff --git a/Makefile b/Makefile
index c9befaf..3b431a2 100644
--- a/Makefile
+++ b/Makefile
@@ -604,7 +604,8 @@ $(foreach d,$(LOCAL_COMMON_DIRS) $(LOCAL_EXTRA_DIRS),$(LOCAL)/$d):
 	$(V_AT)mkdir -p $(dir $(patsubst %/,%,$@))
 	$(call v_tag,MKDIR)mkdir $@
 
-LOCAL_ARCH_DIRS		 = bin/ etc/ games/ include/ lib/ libexec/ sbin/
+LOCAL_ARCH_DIRS		 = bin/ etc/ games/ include/ include.aside/
+LOCAL_ARCH_DIRS		+= lib/ libexec/ sbin/
 LOCAL_ARCH_LINKS	 = man
 man_LINKDEST		 = share/man
 all:: $(foreach a,$(ALL_ARCHS),\
diff --git a/bin/chroot-maint b/bin/chroot-maint
index 4dba315..21e5c21 100755
--- a/bin/chroot-maint
+++ b/bin/chroot-maint
@@ -2669,6 +2669,11 @@ class PackageBuildJob (BaseJob):
       run_schroot_session(session,
                           ["mount", "-oremount,rw", "/usr/local.schroot"],
                           rootp = True, stdin = DISCARD)
+      run_schroot_session(session,
+                          ["mount", "--bind",
+                           "/usr/local.schroot/%s/include.aside" % arch,
+                           "/usr/local.schroot/%s/include" % arch],
+                          rootp = True, stdin = DISCARD)
 
       progress("configure `%s' %s for %s" % (pkg, ver, arch))
       run_schroot_session(session, ["sh", "-e", "-c", """
diff --git a/etc/sbuild.conf.in b/etc/sbuild.conf.in
index 963f7d4..fe0aa10 100644
--- a/etc/sbuild.conf.in
+++ b/etc/sbuild.conf.in
@@ -61,6 +61,11 @@ $build_environment = {
 ## Actually resolve alternatives properly.
 $resolve_alternatives = 1;
 
+## Other things to do.
+$run_autopkgtest = 0;
+$run_lintian = 0;
+$run_piuparts = 0;
+
 ## Leave debris for diagnostics.
 $purge_build_deps = "successful";
 $purge_build_directory = "successful";