Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-07-04 05:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable merged /usr in buildd images

Browse Source 
Otherwise we might end up building packages with hardcoded paths that
assume a merged /usr.
This commit is contained in:
Colin Watson 2019-02-01 18:03:20 +00:00
parent fe59f6fce8
commit 36af2769dc
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.560) UNRELEASED; urgency=medium
* Disable merged /usr in buildd images.
-- Colin Watson <cjwatson@ubuntu.com> Fri, 01 Feb 2019 18:01:56 +0000
livecd-rootfs (2.559) disco; urgency=medium livecd-rootfs (2.559) disco; urgency=medium
[ Jean-Baptiste Lallement ] [ Jean-Baptiste Lallement ]

5
live-build/auto/config
View File

@ -1220,6 +1220,11 @@ 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