[neon/neon/livecd-rootfs/Neon/release] /: Add support for creating images (ubuntu-core and classic) with a kernel optimized for Intel IoT devices. (LP: #1938338)
Brian Murray
null at kde.org
Mon Aug 23 10:20:36 BST 2021
Git commit 69afe8fd5dbac744b0c974b5734ed2f8c2aaaa15 by Brian Murray.
Committed on 28/07/2021 at 20:37.
Pushed by jriddell into branch 'Neon/release'.
Add support for creating images (ubuntu-core and classic) with a kernel optimized for Intel IoT devices. (LP: #1938338)
M +7 -0 debian/changelog
M +34 -2 live-build/auto/config
https://invent.kde.org/neon/neon/livecd-rootfs/commit/69afe8fd5dbac744b0c974b5734ed2f8c2aaaa15
diff --git a/debian/changelog b/debian/changelog
index bd800cb1..4e849cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.664.25) UNRELEASED; urgency=medium
+
+ * Add support for creating images (ubuntu-core and classic) with a kernel
+ optimized for Intel IoT devices. (LP: #1938338)
+
+ -- Brian Murray <brian at ubuntu.com> Wed, 28 Jul 2021 13:31:19 -0700
+
livecd-rootfs (2.664.24) focal; urgency=medium
* Backport generalising of the riscv64 images from hirsute to support
diff --git a/live-build/auto/config b/live-build/auto/config
index 86e506e3..d95fffa1 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -280,7 +280,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled)
case $SUBARCH in
- raspi|imx6)
+ raspi|imx6|intel-iot)
IMAGEFORMAT=ubuntu-image
;;
*)
@@ -320,6 +320,8 @@ case $IMAGEFORMAT in
ubuntu-image)
UBUNTU_IMAGE_ARGS=""
case "$ARCH+${SUBARCH:-}" in
+ intel-iot)
+ MODEL=intel-iot ;;
amd64+*)
MODEL=pc-amd64 ;;
i386+*)
@@ -436,6 +438,9 @@ case $IMAGEFORMAT in
pi)
BRANCH=18-armhf
;;
+ intel-iot)
+ MODEL=pc
+ ;;
esac
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
@@ -444,7 +449,7 @@ case $IMAGEFORMAT in
# We need to look in two places for the gadget tree:
# - Launchpad hosted gadgets will be in the snap-gadget repo
# - Github hosted gadgets are mirrored into a github-mirror repo
- git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget
+ git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget || || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror-$ARCH -b $BRANCH config/$PREFIX-gadget
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "SUITE=$SUITE" >> config/common
@@ -590,6 +595,18 @@ case $PROJECT in
remove_packages_from_seed_regexp minimal.standard desktop-default-languages '^desktop-(?!default-languages|minimal|common)[^.]+$'
remove_packages_from_seed_regexp minimal.standard desktop-default-languages '' # none (if no default langpack is selected)
;;
+
+ desktop-preinstalled)
+ add_task install minimal standard ubuntu-desktop
+ if [ "$SUBARCH" = "intel-iot" ]; then
+ KERNEL_FLAVOURS='image-intel'
+ COMPONENTS='main restricted universe'
+ OPTS="${OPTS:+$OPTS }--initramfs=none"
+ OPTS="${OPTS:+$OPTS }--system=normal"
+ OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+ OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+ OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+ fi
*)
LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop
@@ -815,6 +832,13 @@ case $PROJECT in
arm64)
add_package install flash-kernel
;;
+ amd64)
+ if [ "${SUBARCH:-}" = "intel-iot" ]; then
+ KERNEL_FLAVOURS=image-intel
+ COMPONENTS='main restricted universe'
+ OPTS="${OPTS:+$OPTS }--initramfs=none"
+ fi
+ ;;
riscv64)
if [ -n "$SUBARCH" ]; then
KERNEL_FLAVOURS=generic
@@ -974,6 +998,14 @@ case $PROJECT in
_)
add_chroot_hook remove-python-py
;;
+ amd64)
+ KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
+ case $SUBARCH in
+ intel-iot)
+ COMPONENTS='main restricted universe'
+ KERNEL_FLAVOURS='image-intel'
+ esac
+ ;;
esac
lb config noauto \
More information about the Neon-commits
mailing list