Add intel-iot server images, build intel-iot with the 5.15 kernel.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-06-09 16:52:08 +02:00
parent b9dfc7dec7
commit 8b0cd96803
2 changed files with 16 additions and 3 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.664.42) UNRELEASED; urgency=medium
* Switch intel-iot to use intel-iotg-edge, the 5.15 based IOTG kernel
- While at it, build using the main kernel meta, not just with
linux-image-*
* Add support for building live-server images for intel-iot
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 09 Jun 2022 16:46:37 +0200
livecd-rootfs (2.664.41) focal; urgency=medium
[ Ivan Kapelyukhin ]

View File

@ -599,7 +599,7 @@ case $PROJECT in
# Since for non-pi we don't have any seeds yet but we want to be able to
# grow the rootfs, manually install cloud-initramfs-growroot during build
add_package install cloud-initramfs-growroot
KERNEL_FLAVOURS='image-intel'
KERNEL_FLAVOURS='intel-iotg-edge'
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
@ -614,7 +614,7 @@ case $PROJECT in
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'
KERNEL_FLAVOURS='intel-iotg-edge'
COMPONENTS='main restricted'
fi
;;
@ -746,6 +746,10 @@ case $PROJECT in
;;
esac
COMPONENTS='main'
if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='intel-iotg-edge'
COMPONENTS='main restricted'
fi
PREINSTALL_POOL_SEEDS='server-ship'
;;
@ -839,7 +843,7 @@ case $PROJECT in
;;
amd64*)
if [ "${SUBARCH:-}" = "intel-iot" ]; then
KERNEL_FLAVOURS=image-intel
KERNEL_FLAVOURS=intel-iotg-edge
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
fi