[neon/neon/livecd-rootfs/Neon/release_focal] /: Add intel-iot server images, build intel-iot with the 5.15 kernel.
Łukasz 'sil2100' Zemczak
null at kde.org
Wed Jul 13 16:33:00 BST 2022
Git commit 8b0cd968030baa30ad87cec19c427eeefdcea12a by Łukasz 'sil2100' Zemczak.
Committed on 09/06/2022 at 14:52.
Pushed by jriddell into branch 'Neon/release_focal'.
Add intel-iot server images, build intel-iot with the 5.15 kernel.
M +9 -0 debian/changelog
M +7 -3 live-build/auto/config
https://invent.kde.org/neon/neon/livecd-rootfs/commit/8b0cd968030baa30ad87cec19c427eeefdcea12a
diff --git a/debian/changelog b/debian/changelog
index cac1900f..8bf1bafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at ubuntu.com> Thu, 09 Jun 2022 16:46:37 +0200
+
livecd-rootfs (2.664.41) focal; urgency=medium
[ Ivan Kapelyukhin ]
diff --git a/live-build/auto/config b/live-build/auto/config
index b9272eac..fae8518e 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -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
More information about the Neon-commits
mailing list