diff --git a/debian/changelog b/debian/changelog index 008f9370..6fdee090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.765.2) UNRELEASED; urgency=medium + + * Switch the intel-iot images to use the linux-intel-iotg kernel instead. + (LP: #1980065) + + -- Ɓukasz 'sil2100' Zemczak Thu, 30 Jun 2022 17:26:04 +0200 + livecd-rootfs (2.764.1) jammy; urgency=medium * live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl: 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 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 ;;