copy include.* directories for subiquity desktop install ISOs

ubuntu/include.* are the master location for these files.
Copy them over for projects with similar needs, while skipping ones that
are incorrect.

LP: #2055077
ubuntu-core-desktop-noble
Dan Bungert 10 months ago
parent e4b938adbf
commit 5ac0d924ce

@ -1029,6 +1029,7 @@ case $PROJECT in
touch config/universe-enabled touch config/universe-enabled
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS=lowlatency KERNEL_FLAVOURS=lowlatency
LIVE_LAYER_PARENT=standard
add_task standard minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography add_task standard minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
add_task standard.live ubuntustudio-dvd-live add_task standard.live ubuntustudio-dvd-live
add_package standard.live linux-$KERNEL_FLAVOURS add_package standard.live linux-$KERNEL_FLAVOURS
@ -1568,6 +1569,27 @@ case $PROJECT:${SUBPROJECT:-} in
;; ;;
esac esac
case $PROJECT in
ubuntu-oem|ubuntustudio-dvd|edubuntu|ubuntu-budgie|ubuntucinnamon| \
xubuntu|ubuntukylin|ubuntu-mate)
cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
config/includes.chroot
LIVE_LAYER=${LIVE_LAYER_PARENT:-minimal.standard}.live
cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot.minimal.standard.live \
config/includes.chroot.$LIVE_LAYER
if [ $PROJECT != ubuntu-oem ]; then
# Per note at
# https://code.launchpad.net/~dbungert/livecd-rootfs/+git/livecd-rootfs/+merge/461665/comments/1240590,
# these files are expected to be moved out of livecd-rootfs,
# and are also incorrect for flavors.
rm -f config/includes.chroot.$LIVE_LAYER/usr/lib/systemd/user/ubuntu-desktop-installer.service
rm -f config/includes.chroot.$LIVE_LAYER/share/glib-2.0/schemas/casper.gschema.override
fi
;;
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/

Loading…
Cancel
Save