buildd: Re-enable merged /usr by default, as it is now required

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
This commit is contained in:
Dimitri John Ledkov 2021-04-30 17:54:00 +01:00
parent 56d64dbf31
commit dd79c5c75d
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED

View File

@ -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