From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 19 Apr 2020 17:13:12 +0000 (+0100)
Subject: bin/chroot-maint: Force `--no-merged-usr'.
X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/commitdiff_plain/a323afdf371df04b036f18fee47b912ce42ce200

bin/chroot-maint: Force `--no-merged-usr'.

Otherwise things go excitingly wrong.  The crosstools tree has split
root and `/usr', so when we try to copy the tools into the target
chroot, the corresponding paths start fighting each other, and only one
`.../lib/x86_x64-linux-gnu' symlink can win.

Also, you can't make good package builds with merged `/usr'.

Also also, it's just a really bad idea.
---

diff --git a/bin/chroot-maint b/bin/chroot-maint
index ba6aa50..6202f49 100755
--- a/bin/chroot-maint
+++ b/bin/chroot-maint
@@ -2116,7 +2116,7 @@ class ChrootJob (BaseJob):
 
         ## Install the base system.
         progress("install base system")
-        run_root(["eatmydata", "debootstrap"] +
+        run_root(["eatmydata", "debootstrap", "--no-merged-usr"] +
                  (arch in C.FOREIGN_ARCHS and ["--foreign"] or []) +
                  ["--arch=" + arch, "--variant=minbase",
                   "--include=" + ",".join(C.BASE_PACKAGES),