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

Unbreak cpc/server builds, by ensuring that includes are copied with archived symlinks, and only hooks resolve symlinks when getting copied.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2019-06-20 23:27:36 +01:00
parent 095c8f4696
commit 124d074101
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ livecd-rootfs (2.597) UNRELEASED; urgency=medium
* Install s390-tools-zkey into the installer layer for zkey support in * Install s390-tools-zkey into the installer layer for zkey support in
subiquity. subiquity.
* Unbreak cpc/server builds, by ensuring that includes are copied with
archived symlinks, and only hooks resolve symlinks when getting
copied.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 20 Jun 2019 23:25:13 +0100 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 20 Jun 2019 23:25:13 +0100

16
live-build/auto/config
View File

@ -1103,8 +1103,20 @@ EOF
;; ;;
ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled) ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled)
cp -afL /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ # Ensure that most things e.g. includes.chroot are copied as is
config/ for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
case entry in
hooks)
# But hooks are shared across the projects with symlinks
# dereference them
cp -afL $entry config/
;;
*)
# Most places want to preserve symlinks as is
cp -af $entry config/
;;
esac
done
if [ "$PROJECT" = "ubuntu-cpc" ]; then if [ "$PROJECT" = "ubuntu-cpc" ]; then
case ${IMAGE_TARGETS:-} in case ${IMAGE_TARGETS:-} in