|
|
|
@ -129,7 +129,7 @@ case $IMAGEFORMAT in
|
|
|
|
|
|
|
|
|
|
*)
|
|
|
|
|
case $PROJECT in
|
|
|
|
|
ubuntu-server|ubuntu-touch)
|
|
|
|
|
ubuntu-server|ubuntu-touch|ubuntu-pd)
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
add_package live lupin-casper
|
|
|
|
@ -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-desktop-next)
|
|
|
|
|
ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
add_package live oem-config-gtk ubiquity-frontend-gtk
|
|
|
|
@ -420,8 +420,14 @@ case $PROJECT in
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
ubuntu-touch)
|
|
|
|
|
add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts
|
|
|
|
|
ubuntu-touch|ubuntu-pd)
|
|
|
|
|
if [ "$PROJECT" = "ubuntu-touch" ]; then
|
|
|
|
|
meta_package=ubuntu-touch
|
|
|
|
|
else
|
|
|
|
|
meta_package=ubuntu-pocket-desktop
|
|
|
|
|
fi
|
|
|
|
|
add_package install ubuntu-minimal $meta_package systemd-sysv- packagekit ubuntu-system-settings-online-accounts
|
|
|
|
|
|
|
|
|
|
COMPONENTS='main restricted universe'
|
|
|
|
|
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
|
|
|
|
|
export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
|
|
|
|
@ -524,7 +530,7 @@ case $ARCH in
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case $PROJECT in
|
|
|
|
|
ubuntu-server|ubuntu-core|ubuntu-touch)
|
|
|
|
|
ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd)
|
|
|
|
|
case $SUBPROJECT in
|
|
|
|
|
system-image)
|
|
|
|
|
# keep the kernel for the system-image build
|
|
|
|
@ -665,7 +671,7 @@ EOF
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
ubuntu-touch:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
|
|
|
|
|
ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
|
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
|
|
|
|
|
config/
|
|
|
|
|
;;
|
|
|
|
|