diff --git a/debian/changelog b/debian/changelog index 9f2698f0..ffa66066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ 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. + * Add support for building intel-iot server images. Not used in lunar, but + adding to keep devel up-to-date with changes. -- Łukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 diff --git a/live-build/auto/config b/live-build/auto/config index ff44991d..4f7cf9b9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -897,9 +897,15 @@ case $PROJECT in # the GA and HWE kernels (in separate layers) so this code is # written generically to support both even though a lot of the # time only one kernel is offered. - - # variants='ga hwe' - variants='ga' + case ${SUBARCH-} in + intel-iot) + variants='intel' + ;; + *) + # variants='ga hwe' + variants='ga' + ;; + esac for variant in $variants; do if [ "$variant" = "ga" ]; then @@ -908,6 +914,9 @@ case $PROJECT in elif [ "$variant" = "hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) flavor=generic-hwe + elif [ "$variant" = "intel" ]; then + kernel_metapkg=linux-intel-iotg + flavor=intel-iotg else echo "bogus variant: $variant" exit 1 diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered index 424f7001..f31d5e22 100755 --- a/live-build/lb_binary_layered +++ b/live-build/lb_binary_layered @@ -56,9 +56,12 @@ build_layered_squashfs () { Echo_message "lb_binary_layered: treating pass $pass" + # Per convention, we include the subarch name next to the project + PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH} + # Building squashfs filesystem & manifest local overlay_dir="overlay.${pass}" - base="${PWD}/livecd.${PROJECT}.${pass}" + base="${PWD}/livecd.${PROJECT_FULL}.${pass}" squashfs_f="${base}.squashfs" # We have already treated that pass @@ -113,7 +116,7 @@ build_layered_squashfs () { create_manifest "chroot" "${squashfs_f_manifest}.full" # Delta manifest - diff -NU0 ${PWD}/livecd.${PROJECT}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest + diff -NU0 ${PWD}/livecd.${PROJECT_FULL}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest squashfs_f_size="${base}.size" du -B 1 -s "overlay.${pass}/" | cut -f1 > "${squashfs_f_size}" @@ -121,7 +124,7 @@ build_layered_squashfs () { # We take first live pass for "global" ISO properties (used by installers and checkers): # Prepare initrd + kernel # Main manifest and size files - prefix="livecd.$PROJECT${SUBARCH:+-$SUBARCH}" + prefix="livecd.$PROJECT_FULL" if [ ! -e "${prefix}.manifest" ] && $(is_live_layer "$pass"); then totalsize=$(cat ${squashfs_f_size}) curpass="$pass" @@ -130,7 +133,7 @@ build_layered_squashfs () { # We climbed up the tree to the root layer, we are done [ -z "$curpass" ] && break - totalsize=$(expr $totalsize + $(cat "${PWD}/livecd.${PROJECT}.${curpass}.size")) + totalsize=$(expr $totalsize + $(cat "${PWD}/livecd.${PROJECT_FULL}.${curpass}.size")) done echo ${totalsize} > "${prefix}.size" @@ -141,7 +144,7 @@ build_layered_squashfs () { if [ -f config/$pass.catalog-in.yaml ]; then echo "Expanding catalog entry template for $pass" - usc_opts="--output livecd.${PROJECT}.install-sources.yaml \ + usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \ --template config/$pass.catalog-in.yaml \ --size $(du -B 1 -s chroot/ | cut -f1) --squashfs ${pass}.squashfs \ --translations config/catalog-translations" @@ -168,9 +171,9 @@ do done # Ubiquity-compatible removal manifest for ISO not using a layered-aware installer -if [ -n "$(ls livecd.${PROJECT}.*install.live.manifest.full 2>/dev/null)" ] && \ - [ -n "$(ls livecd.${PROJECT}.*install.manifest.full 2>/dev/null)" ]; then - echo "$(diff livecd.${PROJECT}.*install.live.manifest.full livecd.${PROJECT}.*install.manifest.full | awk '/^< / { print $2 }')" > livecd.${PROJECT}-manifest-remove +if [ -n "$(ls livecd.${PROJECT_FULL}.*install.live.manifest.full 2>/dev/null)" ] && \ + [ -n "$(ls livecd.${PROJECT_FULL}.*install.manifest.full 2>/dev/null)" ]; then + echo "$(diff livecd.${PROJECT_FULL}.*install.live.manifest.full livecd.${PROJECT_FULL}.*install.manifest.full | awk '/^< / { print $2 }')" > livecd.${PROJECT_FULL}-manifest-remove fi chmod 644 *.squashfs *.manifest* *.size diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early index ec02cc3c..a6a19f86 100755 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early @@ -11,6 +11,8 @@ case $PASS in kernel_metapkg=linux-generic elif [ "$flavor" = "generic-hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) + elif [ "$flavor" = "intel-iotg" ]; then + kernel_metapkg=linux-intel-iotg else echo "bogus flavor: $flavor" exit 1 diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary index a5d64a12..551c7a42 100755 --- a/live-build/ubuntu-server/hooks/04-kernel-bits.binary +++ b/live-build/ubuntu-server/hooks/04-kernel-bits.binary @@ -13,6 +13,8 @@ case $PASS in ;; esac +PROJECT=$PROJECT${SUBARCH:+-$SUBARCH} + # Fish out generated kernel image and initrd mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-$flavor mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-$flavor