From 527a7b165e1b15b7bbce14dd051a7c1e71dbe4fc Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 28 Sep 2017 09:34:31 -0400 Subject: [PATCH] Begin adding support for a project-independent 'minimize' subproject, which (ironically) omits ubuntu-minimal in favor of using only the minbase package set. --- live-build/auto/config | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index cbdeea85..a28b6bc6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -196,6 +196,10 @@ HWE_X_PACKAGES="xserver-xorg-hwe-16.04 xserver-xorg-video-all-hwe-16.04 xserver- HWE_KERNEL_FLAVOUR="generic-hwe-16.04" HWE_SIGNED_KERNEL_PACKAGE="linux-signed-$HWE_KERNEL_FLAVOUR" +if [ "$SUBPROJECT" = minimize ]; then + OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" +fi + case $PROJECT in ubuntu|ubuntu-dvd) HWE_BUILD="yes" @@ -495,8 +499,12 @@ case $PROJECT in ;; ubuntu-cpc) - add_task install minimal standard cloud-image - add_package install ubuntu-minimal + if [ "$SUBPROJECT" = minimize ]; then + add_task install cloud-image + else + add_task install minimal standard cloud-image + add_package install ubuntu-minimal + fi BINARY_REMOVE_LINUX=false OPTS="${OPTS:+$OPTS }--initramfs=none"