From db631a4d2fd8b22bcb3e9ac5b6a1b23ed4fdc2a5 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Apr 2015 14:13:37 +0100 Subject: [PATCH] fix some typo and take colin's feedback into account --- live-build/auto/build | 7 +++++-- live-build/auto/config | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index f9e13169..ba39f171 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -332,7 +332,8 @@ fi # ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so # at this point we reset it to "none" as all the work to extract it was done already # in a binary hook -if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then +case $PROJECT:$SUBPROJECT in + ubuntu-core:system-image|ubuntu-desktop-next:system-image) LB_LINUX_FLAVOURS=none # rename to have the right prefix etc @@ -342,7 +343,9 @@ if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then if [ -e device-azure.tar.gz ]; then mv device-azure.tar.gz "$PREFIX.azure.device.tar.gz" fi -fi + ;; +esac + if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then LB_LINUX_FLAVOURS=none diff --git a/live-build/auto/config b/live-build/auto/config index b24e0178..05de8695 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -162,7 +162,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-deskop-next) + ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-desktop-next) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -218,9 +218,6 @@ case $PROJECT in # we use SUBPROJECT to pass on the information if [ "$SUBPROJECT" = "system-image" ]; then OPTS="${OPTS:+$OPTS }--linux-packages=linux-image" - - # universe needed for 'system-image-cli' - COMPONENTS='main restricted universe' fi ;;