diff --git a/debian/changelog b/debian/changelog index 7f4ee3ff..9f2698f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.813) UNRELEASED; urgency=medium + + * Make sure that for devel we also use the right intel-iot kernel flavor + for the images. We don't build any for this series, but it's good to have + parity in the devel branch. + + -- Ɓukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 + livecd-rootfs (2.812) lunar; urgency=medium * Inform cloud-init when network manager is in use. (LP: #1982855) diff --git a/live-build/auto/build b/live-build/auto/build index 83324c25..ddbb7332 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -607,6 +607,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 a281291c..ff44991d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -694,7 +694,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' fi ;; desktop-preinstalled) @@ -712,7 +712,7 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" ;; intel-iot) - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" @@ -1010,7 +1010,7 @@ case $PROJECT in if [ "${SUBARCH:-}" = "generic" ]; then KERNEL_FLAVOURS=generic elif [ "${SUBARCH:-}" = "intel-iot" ]; then - KERNEL_FLAVOURS=image-intel + KERNEL_FLAVOURS=intel-iotg OPTS="${OPTS:+$OPTS }--initramfs=none" fi ;; @@ -1196,7 +1196,7 @@ case $PROJECT in KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in intel-iot) - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' ;; esac ;;