Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forward port some intel-iot changes.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-03-17 11:54:46 +01:00
parent ccd8441a64
commit 3ad215e3f1
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 <lukasz.zemczak@ubuntu.com> 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)

3
live-build/auto/build
View File

@ -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

8
live-build/auto/config
View File

@ -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
;;