|
|
@ -591,7 +591,7 @@ case $IMAGEFORMAT in
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
case $PROJECT in
|
|
|
|
case $PROJECT in
|
|
|
|
kubuntu|lubuntu|ubuntu-unity)
|
|
|
|
kubuntu|ubuntu-unity)
|
|
|
|
add_package live casper
|
|
|
|
add_package live casper
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
@ -681,9 +681,11 @@ if ! [ -e config/germinate-output/structure ]; then
|
|
|
|
-s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
|
|
|
|
-s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
do_layered_desktop_image() {
|
|
|
|
# Common functionality for layered desktop images
|
|
|
|
|
|
|
|
common_layered_desktop_image() {
|
|
|
|
touch config/universe-enabled
|
|
|
|
touch config/universe-enabled
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
|
|
|
|
|
|
|
|
if [ -n "$HAS_MINIMAL" ]; then
|
|
|
|
if [ -n "$HAS_MINIMAL" ]; then
|
|
|
|
if [ -z "$MINIMAL_TASKS" ]; then
|
|
|
|
if [ -z "$MINIMAL_TASKS" ]; then
|
|
|
|
MINIMAL_TASKS="${FLAVOUR}-desktop-minimal"
|
|
|
|
MINIMAL_TASKS="${FLAVOUR}-desktop-minimal"
|
|
|
@ -759,6 +761,11 @@ do_layered_desktop_image() {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
STANDARD_IS_DEFAULT=yes
|
|
|
|
STANDARD_IS_DEFAULT=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Function for standard layered desktop image
|
|
|
|
|
|
|
|
do_layered_desktop_image() {
|
|
|
|
|
|
|
|
common_layered_desktop_image
|
|
|
|
|
|
|
|
|
|
|
|
if [ -n "$HAS_MINIMAL" ]; then
|
|
|
|
if [ -n "$HAS_MINIMAL" ]; then
|
|
|
|
[ -n "$MINIMAL_NAME" ] \
|
|
|
|
[ -n "$MINIMAL_NAME" ] \
|
|
|
@ -787,7 +794,8 @@ do_layered_desktop_image() {
|
|
|
|
locale_support: $LOCALE_SUPPORT
|
|
|
|
locale_support: $LOCALE_SUPPORT
|
|
|
|
EOF
|
|
|
|
EOF
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
write_kernel_yaml linux-$KERNEL_FLAVOURS
|
|
|
|
|
|
|
|
|
|
|
|
write_kernel_yaml "linux-$KERNEL_FLAVOURS"
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$LOCALE_SUPPORT" != none ]; then
|
|
|
|
if [ "$LOCALE_SUPPORT" != none ]; then
|
|
|
|
/usr/share/livecd-rootfs/checkout-translations-branch \
|
|
|
|
/usr/share/livecd-rootfs/checkout-translations-branch \
|
|
|
@ -907,10 +915,21 @@ case $PROJECT in
|
|
|
|
do_layered_desktop_image
|
|
|
|
do_layered_desktop_image
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
lubuntu|ubuntu-unity)
|
|
|
|
ubuntu-unity)
|
|
|
|
add_task install minimal standard ${PROJECT}-desktop
|
|
|
|
add_task install minimal standard ${PROJECT}-desktop
|
|
|
|
LIVE_TASK=${PROJECT}-live
|
|
|
|
LIVE_TASK=${PROJECT}-live
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lubuntu)
|
|
|
|
|
|
|
|
UCFLAVOUR="Lubuntu"
|
|
|
|
|
|
|
|
HAS_MINIMAL=yes
|
|
|
|
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
|
|
|
|
MINIMAL_TASKS=lubuntu-desktop-minimal
|
|
|
|
|
|
|
|
MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
|
|
|
|
|
|
|
|
KERNEL_FLAVOURS=generic
|
|
|
|
|
|
|
|
common_layered_desktop_image
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
ubuntukylin)
|
|
|
|
ubuntukylin)
|
|
|
|
# Ubuntu Kylin now ships the new installer.
|
|
|
|
# Ubuntu Kylin now ships the new installer.
|
|
|
|
UCFLAVOUR="Ubuntu Kylin"
|
|
|
|
UCFLAVOUR="Ubuntu Kylin"
|
|
|
@ -1456,7 +1475,7 @@ case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
|
|
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
|
|
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
|
|
|
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
|
|
|
|
ubuntustudio:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
|
|
|
|
ubuntustudio:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
|
|
|
|
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-installer:*)
|
|
|
|
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-installer:*|lubuntu:*)
|
|
|
|
# Ensure that most things e.g. includes.chroot are copied as is
|
|
|
|
# Ensure that most things e.g. includes.chroot are copied as is
|
|
|
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
|
|
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
|
|
|
case $entry in
|
|
|
|
case $entry in
|
|
|
@ -1492,7 +1511,7 @@ esac
|
|
|
|
|
|
|
|
|
|
|
|
case $PROJECT in
|
|
|
|
case $PROJECT in
|
|
|
|
ubuntu-oem|ubuntustudio|edubuntu|ubuntu-budgie|ubuntucinnamon| \
|
|
|
|
ubuntu-oem|ubuntustudio|edubuntu|ubuntu-budgie|ubuntucinnamon| \
|
|
|
|
xubuntu|ubuntukylin|ubuntu-mate)
|
|
|
|
xubuntu|ubuntukylin|ubuntu-mate|lubuntu)
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
|
|
|
|
config/includes.chroot
|
|
|
|
config/includes.chroot
|
|
|
|
|
|
|
|
|
|
|
|