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

Additional changes were needed for the server-live hooks, since those were exiting early for SUBARCH images.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-06-10 16:46:10 +02:00
parent f59dad4ce9
commit 7410fc4a3e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live-build/ubuntu-server/hooks/030-root-squashfs.binary
View File

@ -15,7 +15,7 @@ case $IMAGE_TARGETS in
;; ;;
esac esac
if [ -n "$SUBARCH" ]; then if [ -n "$SUBARCH" && "$SUBARCH" != "intel-iot" ]; then
echo "Skipping rootfs build for subarch flavor build" echo "Skipping rootfs build for subarch flavor build"
exit 0 exit 0
fi fi

2
live-build/ubuntu-server/hooks/032-installer-squashfs.binary
View File

@ -16,7 +16,7 @@ case $IMAGE_TARGETS in
;; ;;
esac esac
if [ -n "$SUBARCH" ]; then if [ -n "$SUBARCH" && "$SUBARCH" != "intel-iot" ]; then
echo "Skipping rootfs build for subarch flavor build" echo "Skipping rootfs build for subarch flavor build"
exit 0 exit 0
fi fi

14
live-build/ubuntu-server/hooks/033-kernel-bits.binary
View File

@ -14,7 +14,7 @@ case ${IMAGE_TARGETS-} in
;; ;;
esac esac
if [ -n "${SUBARCH-}" ]; then if [ -n "${SUBARCH-}" && "$SUBARCH" != "intel-iot" ]; then
echo "Skipping rootfs build for subarch flavor build" echo "Skipping rootfs build for subarch flavor build"
exit 0 exit 0
fi fi
@ -27,7 +27,14 @@ INSTALLER_ROOT=binary/boot/installer.squashfs.dir
KERNEL_BITS_ROOT=binary/boot/kernel-bits.dir KERNEL_BITS_ROOT=binary/boot/kernel-bits.dir
KERNEL_BITS_OVERLAY=binary/boot/overlay-kernel-bits KERNEL_BITS_OVERLAY=binary/boot/overlay-kernel-bits
variants='ga hwe' case ${SUBARCH-} in
intel-iot)
variants='intel'
;;
*)
variants='ga hwe'
;;
esac
for variant in $variants; do for variant in $variants; do
if [ "$variant" = "ga" ]; then if [ "$variant" = "ga" ]; then
@ -36,6 +43,9 @@ for variant in $variants; do
elif [ "$variant" = "hwe" ]; then elif [ "$variant" = "hwe" ]; then
kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
flavor=generic-hwe flavor=generic-hwe
elif [ "$variant" = "intel" ]; then
kernel_metapkg=linux-intel-iotg-edge
flavor=intel-iotg
else else
echo "bogus variant: $variant" echo "bogus variant: $variant"
exit 1 exit 1