From 198a2f6faf6cf4f65ed2a786ad4842f291ed8971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 10 Jun 2022 11:16:19 +0200 Subject: [PATCH 1/3] Switch the intel-iot images to use the linux-intel-iotg kernel instead. --- debian/changelog | 6 ++++++ live-build/auto/config | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4b6c681..11b3f5d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.765.1) UNRELEASED; urgency=medium + + * Switch the intel-iot images to use the linux-intel-iotg kernel instead. + + -- Łukasz 'sil2100' Zemczak Fri, 10 Jun 2022 11:14:36 +0200 + livecd-rootfs (2.764) jammy; urgency=medium [ Michał Sawicz ] diff --git a/live-build/auto/config b/live-build/auto/config index e223954e..0d83ecb7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -704,7 +704,7 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" ;; intel-iot) - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' COMPONENTS='main restricted' OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--system=normal" @@ -723,7 +723,7 @@ case $PROJECT in add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages KERNEL_FLAVOURS='generic-hwe-22.04' if [ "$SUBARCH" = "intel-iot" ]; then - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' COMPONENTS='main restricted' fi ;; @@ -931,7 +931,7 @@ case $PROJECT in if [ "${SUBARCH:-}" = "generic" ]; then KERNEL_FLAVOURS=generic elif [ "${SUBARCH:-}" = "intel-iot" ]; then - KERNEL_FLAVOURS=image-intel + KERNEL_FLAVOURS=intel-iotg COMPONENTS='main restricted' OPTS="${OPTS:+$OPTS }--initramfs=none" fi @@ -1095,7 +1095,7 @@ case $PROJECT in case $SUBARCH in intel-iot) COMPONENTS='main restricted' - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' ;; esac ;; From a894c4e85fa908bf208aa6d6b97eed626a583a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 13 Jun 2022 10:09:31 +0200 Subject: [PATCH 2/3] Make sure the intel-iotg flavor is handled in auto/build --- live-build/auto/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/live-build/auto/build b/live-build/auto/build index 7621de65..1b6ee503 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -580,6 +580,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do image-intel) FLAVOUR="intel" ;; + intel-iotg*) + FLAVOUR="intel-iotg" + ;; 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 From 9261aec27a1eb6a3524a710cc7b5326f7ce54d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 28 Jun 2022 10:42:12 +0200 Subject: [PATCH 3/3] Add bug numbers --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 11b3f5d4..e262477d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.765.1) UNRELEASED; urgency=medium * Switch the intel-iot images to use the linux-intel-iotg kernel instead. + (LP: #1980065) -- Łukasz 'sil2100' Zemczak Fri, 10 Jun 2022 11:14:36 +0200