mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-19 14:51:49 +00:00
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:
parent
56d64dbf31
commit
dd79c5c75d
@ -1257,11 +1257,6 @@ esac
|
|||||||
case $SUBPROJECT in
|
case $SUBPROJECT in
|
||||||
buildd)
|
buildd)
|
||||||
cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/
|
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
|
esac
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user