Merge branch 'bdmurray/iotg' which adds the ability to create an image for Intel IOT devices.

bdmurray/intel-iot-models
Brian Murray 4 years ago
commit 89ff3c4f87

@ -299,7 +299,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled) ubuntu-cpc:*|ubuntu:desktop-preinstalled)
case $SUBARCH in case $SUBARCH in
raspi) raspi|intel-iotg)
IMAGEFORMAT=ubuntu-image IMAGEFORMAT=ubuntu-image
;; ;;
*) *)
@ -632,7 +632,8 @@ case $PROJECT in
desktop-preinstalled) desktop-preinstalled)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
if [ "$SUBARCH" = "raspi" ]; then case $SUBARCH in
raspi)
add_task install ubuntu-desktop-raspi add_task install ubuntu-desktop-raspi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# for existing raspi preinstalled images # for existing raspi preinstalled images
@ -642,10 +643,21 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
fi ;;
intel-iotg)
KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted universe'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;;
*)
## Otherwise HYPERV image options.... *crickets* see the hyperv hook ## Otherwise HYPERV image options.... *crickets* see the hyperv hook
;; ;;
esac
;;
*) *)
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
@ -807,6 +819,10 @@ case $PROJECT in
amd64) amd64)
if [ "${SUBARCH:-}" = "generic" ]; then if [ "${SUBARCH:-}" = "generic" ]; then
KERNEL_FLAVOURS=generic KERNEL_FLAVOURS=generic
elif [ "${SUBARCH:-}" = "intel-iotg" ]; then
KERNEL_FLAVOURS=image-intel
COMPONENTS='main restricted universe'
OPTS="${OPTS:+$OPTS }--initramfs=none"
fi fi
;; ;;
riscv64*) riscv64*)
@ -960,6 +976,14 @@ case $PROJECT in
_) _)
add_chroot_hook remove-python-py add_chroot_hook remove-python-py
;; ;;
amd64)
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in
intel-iotg)
COMPONENTS='main restricted universe'
KERNEL_FLAVOURS='image-intel'
esac
;;
esac esac
lb config noauto \ lb config noauto \

Loading…
Cancel
Save