@ -324,6 +324,13 @@ case $PROJECT in
ubuntu-core)
ubuntu-core)
add_task install minimal
add_task install minimal
# mvo: This is for cron.daily-preinstalled
# CDIMAGE_PREINSTALLED is not passed from build.py
# and PREINSTALLED means something different. So
# we use SUBPROJECT to pass on the information
if [ "$SUBPROJECT" = "system-image" ]; then
add_task install ubuntu-core
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
;;
@ -429,10 +436,16 @@ esac
case $PROJECT in
case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch)
ubuntu-server|ubuntu-core|ubuntu-touch)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
case $SUBPROJECT in
KERNEL_FLAVOURS=none
system-image)
BINARY_REMOVE_LINUX=false
# keep the kernel for the system-image build
;;
;;
*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
esac
esac
esac
add_chroot_hook update-apt-file-cache
add_chroot_hook update-apt-file-cache