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

ubuntu/disco
Dimitri John Ledkov 6 years ago committed by David Krauser
parent 86eb0e9916
commit ba29aa2120

@ -1204,8 +1204,20 @@ EOF
;; ;;
ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled) ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next: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

Loading…
Cancel
Save