|
|
@ -111,7 +111,13 @@ case $IMAGEFORMAT in
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
add_package live jasper
|
|
|
|
case $PROJECT in
|
|
|
|
|
|
|
|
ubuntu-cpc)
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
|
|
|
|
add_package live jasper
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
;;
|
|
|
@ -156,7 +162,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
|
|
|
|
ubuntu-server)
|
|
|
|
ubuntu-server)
|
|
|
|
add_package live oem-config-debconf ubiquity-frontend-debconf
|
|
|
|
add_package live oem-config-debconf ubiquity-frontend-debconf
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
ubuntu-core|base|ubuntu-touch)
|
|
|
|
ubuntu-core|base|ubuntu-touch|ubuntu-cpc)
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
add_package live oem-config-gtk ubiquity-frontend-gtk
|
|
|
|
add_package live oem-config-gtk ubiquity-frontend-gtk
|
|
|
@ -440,6 +446,9 @@ case $PROJECT in
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ubuntu-cpc)
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
echo "unknown project $PROJECT" >&2
|
|
|
|
echo "unknown project $PROJECT" >&2
|
|
|
|
exit 2
|
|
|
|
exit 2
|
|
|
@ -523,6 +532,14 @@ case $PROJECT in
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$PROJECT" = "ubuntu-cpc" ]; then
|
|
|
|
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
|
|
|
|
|
|
|
KERNEL_FLAVOURS=none
|
|
|
|
|
|
|
|
add_package install linux-virtual
|
|
|
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--package-list=ubuntu-cloud-t --system=normal"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
add_chroot_hook update-apt-file-cache
|
|
|
|
add_chroot_hook update-apt-file-cache
|
|
|
|
add_chroot_hook update-apt-xapian-index
|
|
|
|
add_chroot_hook update-apt-xapian-index
|
|
|
|
add_chroot_hook update-mlocate-database
|
|
|
|
add_chroot_hook update-mlocate-database
|
|
|
|