Add the capability to build an ISO image for the Intel IoT project. Additionally, stop using universe with the project given that the kernel is now in main.

This commit is contained in:
Brian Murray 2021-11-16 17:00:38 -08:00
parent f191c439c4
commit 8288552dea
3 changed files with 19 additions and 3 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.664.34) focal; urgency=medium
* Add the capability to build an ISO image for the Intel IoT project.
Additionally, stop using universe with the project given that the kernel
is now in main. (LP: #1951173)
-- Brian Murray <brian@ubuntu.com> Tue, 16 Nov 2021 16:56:36 -0800
livecd-rootfs (2.664.33) focal; urgency=medium
* Install cloud-initramfs-growroot to actually enable rootfs resize.

View File

@ -852,6 +852,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
oem-*)
FLAVOUR="oem"
;;
image-intel)
FLAVOUR="intel"
;;
esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then

View File

@ -605,7 +605,7 @@ case $PROJECT in
# grow the rootfs, manually install cloud-initramfs-growroot during build
add_package install cloud-initramfs-growroot
KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
@ -618,6 +618,10 @@ case $PROJECT in
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-20.04'
if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted'
fi
;;
esac
;;
@ -841,7 +845,7 @@ case $PROJECT in
amd64*)
if [ "${SUBARCH:-}" = "intel-iot" ]; then
KERNEL_FLAVOURS=image-intel
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
fi
;;
@ -1008,8 +1012,9 @@ case $PROJECT in
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in
intel-iot)
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
KERNEL_FLAVOURS='image-intel'
;;
esac
;;
esac