From 36af2769dc1ee47d45bb3c408125ab56da61f51c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 1 Feb 2019 18:03:20 +0000 Subject: [PATCH] Disable merged /usr in buildd images Otherwise we might end up building packages with hardcoded paths that assume a merged /usr. --- debian/changelog | 6 ++++++ live-build/auto/config | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 36bf3537..71c1f96d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.560) UNRELEASED; urgency=medium + + * Disable merged /usr in buildd images. + + -- Colin Watson Fri, 01 Feb 2019 18:01:56 +0000 + livecd-rootfs (2.559) disco; urgency=medium [ Jean-Baptiste Lallement ] diff --git a/live-build/auto/config b/live-build/auto/config index 0f7d2b0b..b36977be 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1220,6 +1220,11 @@ esac case $SUBPROJECT in buildd) cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/ + + # Disable merged /usr to avoid building packages with + # hardcoded paths that assume it. + echo 'DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --no-merged-usr"' \ + >> config/common ;; esac