mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 11:21:12 +00:00
Merge branch 'usr-merge' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
This commit is contained in:
commit
b194e57eff
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user