From dd79c5c75de49169c8201f5a631ee6f73e2fbf67 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 30 Apr 2021 17:54:00 +0100 Subject: [PATCH] buildd: Re-enable merged /usr by default, as it is now required Signed-off-by: Dimitri John Ledkov --- live-build/auto/config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 99b2a4e4..801d3d0f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1257,11 +1257,6 @@ 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