|
|
@ -813,6 +813,9 @@ case $SUBPROJECT in
|
|
|
|
add_package install build-essential
|
|
|
|
add_package install build-essential
|
|
|
|
# Needed for LXD-based builds.
|
|
|
|
# Needed for LXD-based builds.
|
|
|
|
add_package install init
|
|
|
|
add_package install init
|
|
|
|
|
|
|
|
# Not strictly build-essential, but traditionally present
|
|
|
|
|
|
|
|
# and a variety of things fail without it.
|
|
|
|
|
|
|
|
add_package install tzdata
|
|
|
|
|
|
|
|
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/make-lxd-metadata.py config/make-lxd-metadata
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/make-lxd-metadata.py config/make-lxd-metadata
|
|
|
|
;;
|
|
|
|
;;
|
|
|
@ -1100,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
|
|
|
|