Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jammy-iotg-bump' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/jammy

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-06-30 17:26:30 +02:00
commit 71405af933
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <lukasz.zemczak@ubuntu.com> Thu, 30 Jun 2022 17:26:04 +0200
livecd-rootfs (2.764.1) jammy; urgency=medium livecd-rootfs (2.764.1) jammy; urgency=medium
* live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl: * live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl:

3
live-build/auto/build
View File

@ -580,6 +580,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
image-intel) image-intel)
FLAVOUR="intel" FLAVOUR="intel"
;; ;;
intel-iotg*)
FLAVOUR="intel-iotg"
;;
esac esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" 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 if [ -z "$KVERS" ]; then

8
live-build/auto/config
View File

@ -704,7 +704,7 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;; ;;
intel-iot) intel-iot)
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
COMPONENTS='main restricted' COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--system=normal"
@ -723,7 +723,7 @@ case $PROJECT in
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
if [ "$SUBARCH" = "intel-iot" ]; then if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
COMPONENTS='main restricted' COMPONENTS='main restricted'
fi fi
;; ;;
@ -931,7 +931,7 @@ case $PROJECT in
if [ "${SUBARCH:-}" = "generic" ]; then if [ "${SUBARCH:-}" = "generic" ]; then
KERNEL_FLAVOURS=generic KERNEL_FLAVOURS=generic
elif [ "${SUBARCH:-}" = "intel-iot" ]; then elif [ "${SUBARCH:-}" = "intel-iot" ]; then
KERNEL_FLAVOURS=image-intel KERNEL_FLAVOURS=intel-iotg
COMPONENTS='main restricted' COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
fi fi
@ -1095,7 +1095,7 @@ case $PROJECT in
case $SUBARCH in case $SUBARCH in
intel-iot) intel-iot)
COMPONENTS='main restricted' COMPONENTS='main restricted'
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
;; ;;
esac esac
;; ;;