diff --git a/debian/changelog b/debian/changelog index 89b88f86..b4daa2e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.232) utopic; urgency=medium + + [ James Hunt ] + * live-build/auto/config: Enable universe for system-image ubuntu-core + sub-project which requires 'system-image-cli'. + + -- Colin Watson Wed, 30 Jul 2014 17:56:04 +0100 + livecd-rootfs (2.231) utopic; urgency=medium * Hard-code installation of libmirclientplatform-android and diff --git a/live-build/auto/config b/live-build/auto/config index bd5eaca1..9d49de44 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -324,13 +324,15 @@ case $PROJECT in ubuntu-core) 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 + # 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 + # universe needed for 'system-image-cli' + COMPONENTS='main restricted universe' + fi OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; @@ -436,14 +438,14 @@ esac case $PROJECT in ubuntu-server|ubuntu-core|ubuntu-touch) - case $SUBPROJECT in + case $SUBPROJECT in system-image) - # keep the kernel for the system-image build + # keep the kernel for the system-image build ;; *) - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - KERNEL_FLAVOURS=none - BINARY_REMOVE_LINUX=false + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false ;; esac esac