Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-29 03:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Murray 2021-06-30 15:52:36 -07:00
commit 89ff3c4f87
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
live-build/auto/config
View File

@ -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,20 +632,32 @@ 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
add_task install ubuntu-desktop-raspi raspi)
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project add_task install ubuntu-desktop-raspi
# for existing raspi preinstalled images # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary # for existing raspi preinstalled images
OPTS="${OPTS:+$OPTS }--initramfs=none" # XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
fi OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
## Otherwise HYPERV image options.... *crickets* see the hyperv hook ;;
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
;;
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 \