Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-01 13:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'usr-merge' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2021-05-05 11:38:55 +01:00
commit b194e57eff
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live-build/auto/config
View File

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