* [PATCH] meta-isar: add support for Ubuntu 24.04 (noble) @ 2024-09-23 12:39 'Cedric Hombourger' via isar-users 2024-09-23 12:43 ` 'MOESSBAUER, Felix' via isar-users 0 siblings, 1 reply; 6+ messages in thread From: 'Cedric Hombourger' via isar-users @ 2024-09-23 12:39 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com> --- doc/user_manual.md | 1 + meta-isar/conf/distro/ubuntu-common.inc | 5 ++++- meta-isar/conf/distro/ubuntu-noble-ports.list | 6 ++++++ meta-isar/conf/distro/ubuntu-noble.conf | 12 ++++++++++++ meta-isar/conf/distro/ubuntu-noble.list | 6 ++++++ meta-isar/conf/machine/qemuarm64.conf | 1 + meta-isar/conf/mc.conf | 2 ++ meta-isar/conf/multiconfig/qemuamd64-noble.conf | 7 +++++++ meta-isar/conf/multiconfig/qemuarm64-noble.conf | 7 +++++++ .../lib/wic/plugins/source/bootimg-efi-isar.py | 3 ++- 10 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-noble-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-noble.conf create mode 100644 meta-isar/conf/distro/ubuntu-noble.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-noble.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-noble.conf diff --git a/doc/user_manual.md b/doc/user_manual.md index 706c74bf..847f4b07 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -455,6 +455,7 @@ following distros: - debian-trixie (host >= bookworm) - ubuntu-focal - ubuntu-jammy (requires host dpkg >= 1.21) + - ubuntu-noble (requires host dpkg >= 1.21) - raspios-bullseye User can select appropriate distro for specific machine by setting the following variable in machine configuration file: diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 232bee35..884f7a7a 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -31,7 +31,10 @@ DISTRO_KERNELS ?= " \ IMAGE_PREINSTALL += "init" IMAGE_PREINSTALL += "initramfs-tools" -IMAGER_INSTALL:wic += "python3-distutils" +UBUNTU_WIC_DEPS = "" +UBUNTU_WIC_DEPS:focal = "python3-distutils" +UBUNTU_WIC_DEPS:jammy = "python3-distutils" +IMAGER_INSTALL:wic += "${UBUNTU_WIC_DEPS}" SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" diff --git a/meta-isar/conf/distro/ubuntu-noble-ports.list b/meta-isar/conf/distro/ubuntu-noble-ports.list new file mode 100644 index 00000000..adeb2639 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble-ports.list @@ -0,0 +1,6 @@ +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-noble.conf b/meta-isar/conf/distro/ubuntu-noble.conf new file mode 100644 index 00000000..531f085f --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +require conf/distro/ubuntu-common.inc + +BASE_DISTRO_CODENAME = "noble" + +DISTRO_GCC = "13" + +DEBIAN_COMPAT = "13" diff --git a/meta-isar/conf/distro/ubuntu-noble.list b/meta-isar/conf/distro/ubuntu-noble.list new file mode 100644 index 00000000..91393a21 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble.list @@ -0,0 +1,6 @@ +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 9706bbe0..d3403303 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -6,6 +6,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME:ubuntu-focal ?= "generic" KERNEL_NAME:ubuntu-jammy ?= "generic" +KERNEL_NAME:ubuntu-noble ?= "generic" IMAGE_FSTYPES ?= "ext4" ROOTFS_EXTRA ?= "128" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index d8c3a3a7..212d3e4d 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -61,6 +61,8 @@ BBMULTICONFIG = " \ starfive-visionfive2-sid \ qemuarm64-focal \ qemuarm64-jammy \ + qemuarm64-noble \ qemuamd64-focal \ qemuamd64-jammy \ + qemuamd64-noble \ " diff --git a/meta-isar/conf/multiconfig/qemuamd64-noble.conf b/meta-isar/conf/multiconfig/qemuamd64-noble.conf new file mode 100644 index 00000000..e052eff1 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-noble.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "ubuntu-noble" diff --git a/meta-isar/conf/multiconfig/qemuarm64-noble.conf b/meta-isar/conf/multiconfig/qemuarm64-noble.conf new file mode 100644 index 00000000..b87df1b6 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-noble.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "ubuntu-noble" diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 4bfb70a0..079b70d6 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -414,7 +414,8 @@ class BootimgEFIPlugin(SourcePlugin): grub_target = 'x86_64-efi' grub_image = "bootx64.efi" grub_modules = "multiboot efi_uga iorw ata " - if get_bitbake_var("DISTRO").startswith("ubuntu"): + if get_bitbake_var("DISTRO").startswith("ubuntu") and \ + os.path.exists('/usr/lib/grub/x86_64-efi/linuxefi.mod'): grub_modules += "linuxefi " elif distro_arch == "i386": grub_target = 'i386-efi' -- 2.39.2 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240923123914.150282-1-cedric.hombourger%40siemens.com. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] meta-isar: add support for Ubuntu 24.04 (noble) 2024-09-23 12:39 [PATCH] meta-isar: add support for Ubuntu 24.04 (noble) 'Cedric Hombourger' via isar-users @ 2024-09-23 12:43 ` 'MOESSBAUER, Felix' via isar-users 2024-09-23 12:51 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 'Cedric Hombourger' via isar-users 0 siblings, 1 reply; 6+ messages in thread From: 'MOESSBAUER, Felix' via isar-users @ 2024-09-23 12:43 UTC (permalink / raw) To: isar-users, cedric.hombourger On Mon, 2024-09-23 at 14:39 +0200, 'Cedric Hombourger' via isar-users wrote: > Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com> > --- > doc/user_manual.md | 1 + > meta-isar/conf/distro/ubuntu-common.inc | 5 ++++- > meta-isar/conf/distro/ubuntu-noble-ports.list | 6 ++++++ > meta-isar/conf/distro/ubuntu-noble.conf | 12 > ++++++++++++ > meta-isar/conf/distro/ubuntu-noble.list | 6 ++++++ > meta-isar/conf/machine/qemuarm64.conf | 1 + > meta-isar/conf/mc.conf | 2 ++ > meta-isar/conf/multiconfig/qemuamd64-noble.conf | 7 +++++++ > meta-isar/conf/multiconfig/qemuarm64-noble.conf | 7 +++++++ > .../lib/wic/plugins/source/bootimg-efi-isar.py | 3 ++- > 10 files changed, 48 insertions(+), 2 deletions(-) > create mode 100644 meta-isar/conf/distro/ubuntu-noble-ports.list > create mode 100644 meta-isar/conf/distro/ubuntu-noble.conf > create mode 100644 meta-isar/conf/distro/ubuntu-noble.list > create mode 100644 meta-isar/conf/multiconfig/qemuamd64-noble.conf > create mode 100644 meta-isar/conf/multiconfig/qemuarm64-noble.conf > > diff --git a/doc/user_manual.md b/doc/user_manual.md > index 706c74bf..847f4b07 100644 > --- a/doc/user_manual.md > +++ b/doc/user_manual.md > @@ -455,6 +455,7 @@ following distros: > - debian-trixie (host >= bookworm) > - ubuntu-focal > - ubuntu-jammy (requires host dpkg >= 1.21) > + - ubuntu-noble (requires host dpkg >= 1.21) To make this properly work, we need kas-isar:4.5, as this includes the zstd reprepro patch. For details, see https://github.com/siemens/kas/commit/ffa795c3458e8a074c5f7e0378095d4d01e42aa2 Cheers! Felix > - raspios-bullseye > > User can select appropriate distro for specific machine by setting > the following variable in machine configuration file: > diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta- > isar/conf/distro/ubuntu-common.inc > index 232bee35..884f7a7a 100644 > --- a/meta-isar/conf/distro/ubuntu-common.inc > +++ b/meta-isar/conf/distro/ubuntu-common.inc > @@ -31,7 +31,10 @@ DISTRO_KERNELS ?= " \ > IMAGE_PREINSTALL += "init" > IMAGE_PREINSTALL += "initramfs-tools" > > -IMAGER_INSTALL:wic += "python3-distutils" > +UBUNTU_WIC_DEPS = "" > +UBUNTU_WIC_DEPS:focal = "python3-distutils" > +UBUNTU_WIC_DEPS:jammy = "python3-distutils" > +IMAGER_INSTALL:wic += "${UBUNTU_WIC_DEPS}" > > SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" > SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" > diff --git a/meta-isar/conf/distro/ubuntu-noble-ports.list b/meta- > isar/conf/distro/ubuntu-noble-ports.list > new file mode 100644 > index 00000000..adeb2639 > --- /dev/null > +++ b/meta-isar/conf/distro/ubuntu-noble-ports.list > @@ -0,0 +1,6 @@ > +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble > main restricted universe multiverse > +deb-src [arch=armhf,arm64] > http://ports.ubuntu.com/ubuntu-ports noble main restricted universe > multiverse > +deb [arch=armhf,arm64] > http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted > universe multiverse > +deb-src [arch=armhf,arm64] > http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted > universe multiverse > +deb [arch=armhf,arm64] > http://ports.ubuntu.com/ubuntu-ports noble-security main restricted > universe multiverse > +deb-src [arch=armhf,arm64] > http://ports.ubuntu.com/ubuntu-ports noble-security main restricted > universe multiverse > diff --git a/meta-isar/conf/distro/ubuntu-noble.conf b/meta- > isar/conf/distro/ubuntu-noble.conf > new file mode 100644 > index 00000000..531f085f > --- /dev/null > +++ b/meta-isar/conf/distro/ubuntu-noble.conf > @@ -0,0 +1,12 @@ > +# > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +require conf/distro/ubuntu-common.inc > + > +BASE_DISTRO_CODENAME = "noble" > + > +DISTRO_GCC = "13" > + > +DEBIAN_COMPAT = "13" > diff --git a/meta-isar/conf/distro/ubuntu-noble.list b/meta- > isar/conf/distro/ubuntu-noble.list > new file mode 100644 > index 00000000..91393a21 > --- /dev/null > +++ b/meta-isar/conf/distro/ubuntu-noble.list > @@ -0,0 +1,6 @@ > +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble main > restricted universe multiverse > +deb-src [arch=amd64,i386] > http://archive.ubuntu.com/ubuntu noble main restricted universe > multiverse > +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble- > updates main restricted universe multiverse > +deb-src [arch=amd64,i386] > http://archive.ubuntu.com/ubuntu noble-updates main restricted > universe multiverse > +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble- > security main restricted universe multiverse > +deb-src [arch=amd64,i386] > http://archive.ubuntu.com/ubuntu noble-security main restricted > universe multiverse > diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta- > isar/conf/machine/qemuarm64.conf > index 9706bbe0..d3403303 100644 > --- a/meta-isar/conf/machine/qemuarm64.conf > +++ b/meta-isar/conf/machine/qemuarm64.conf > @@ -6,6 +6,7 @@ DISTRO_ARCH ?= "arm64" > KERNEL_NAME ?= "arm64" > KERNEL_NAME:ubuntu-focal ?= "generic" > KERNEL_NAME:ubuntu-jammy ?= "generic" > +KERNEL_NAME:ubuntu-noble ?= "generic" > > IMAGE_FSTYPES ?= "ext4" > ROOTFS_EXTRA ?= "128" > diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf > index d8c3a3a7..212d3e4d 100644 > --- a/meta-isar/conf/mc.conf > +++ b/meta-isar/conf/mc.conf > @@ -61,6 +61,8 @@ BBMULTICONFIG = " \ > starfive-visionfive2-sid \ > qemuarm64-focal \ > qemuarm64-jammy \ > + qemuarm64-noble \ > qemuamd64-focal \ > qemuamd64-jammy \ > + qemuamd64-noble \ > " > diff --git a/meta-isar/conf/multiconfig/qemuamd64-noble.conf b/meta- > isar/conf/multiconfig/qemuamd64-noble.conf > new file mode 100644 > index 00000000..e052eff1 > --- /dev/null > +++ b/meta-isar/conf/multiconfig/qemuamd64-noble.conf > @@ -0,0 +1,7 @@ > +# > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +MACHINE ?= "qemuamd64" > +DISTRO ?= "ubuntu-noble" > diff --git a/meta-isar/conf/multiconfig/qemuarm64-noble.conf b/meta- > isar/conf/multiconfig/qemuarm64-noble.conf > new file mode 100644 > index 00000000..b87df1b6 > --- /dev/null > +++ b/meta-isar/conf/multiconfig/qemuarm64-noble.conf > @@ -0,0 +1,7 @@ > +# > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +MACHINE ?= "qemuarm64" > +DISTRO ?= "ubuntu-noble" > diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > index 4bfb70a0..079b70d6 100644 > --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > @@ -414,7 +414,8 @@ class BootimgEFIPlugin(SourcePlugin): > grub_target = 'x86_64-efi' > grub_image = "bootx64.efi" > grub_modules = "multiboot efi_uga iorw ata " > - if > get_bitbake_var("DISTRO").startswith("ubuntu"): > + if > get_bitbake_var("DISTRO").startswith("ubuntu") and \ > + os.path.exists('/usr/lib/grub/x86_64- > efi/linuxefi.mod'): > grub_modules += "linuxefi " > elif distro_arch == "i386": > grub_target = 'i386-efi' > -- > 2.39.2 > -- Siemens AG, Technology Linux Expert Center -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/d792ba03fef23d78f9722a7a5d40ee07ffb2c329.camel%40siemens.com. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 2024-09-23 12:43 ` 'MOESSBAUER, Felix' via isar-users @ 2024-09-23 12:51 ` 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 1/2] kas: update kas-container to version 4.5 'Cedric Hombourger' via isar-users ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: 'Cedric Hombourger' via isar-users @ 2024-09-23 12:51 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Changes compared to v1: - upgrade kas-container to version 4.5 as recommended by Felix Cedric Hombourger (2): kas: update kas-container to version 4.5 meta-isar: add support for Ubuntu 24.04 (noble) doc/user_manual.md | 1 + kas/kas-container | 159 ++++++++++++------ meta-isar/conf/distro/ubuntu-common.inc | 5 +- meta-isar/conf/distro/ubuntu-noble-ports.list | 6 + meta-isar/conf/distro/ubuntu-noble.conf | 12 ++ meta-isar/conf/distro/ubuntu-noble.list | 6 + meta-isar/conf/machine/qemuarm64.conf | 1 + meta-isar/conf/mc.conf | 2 + .../conf/multiconfig/qemuamd64-noble.conf | 7 + .../conf/multiconfig/qemuarm64-noble.conf | 7 + .../wic/plugins/source/bootimg-efi-isar.py | 3 +- 11 files changed, 151 insertions(+), 58 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-noble-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-noble.conf create mode 100644 meta-isar/conf/distro/ubuntu-noble.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-noble.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-noble.conf -- 2.39.2 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240923125127.150443-1-cedric.hombourger%40siemens.com. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] kas: update kas-container to version 4.5 2024-09-23 12:51 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 'Cedric Hombourger' via isar-users @ 2024-09-23 12:51 ` 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 2/2] meta-isar: add support for Ubuntu 24.04 (noble) 'Cedric Hombourger' via isar-users 2024-10-21 10:50 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble Uladzimir Bely 2 siblings, 0 replies; 6+ messages in thread From: 'Cedric Hombourger' via isar-users @ 2024-09-23 12:51 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Prepare support for newer Ubuntu images and update kas-container to the latest where an adequate version of reprepro is pre-installed into the container. See https://github.com/siemens/kas/commit/ffa795c3458e8a074c5f7e0378095d4d01e42aa2 Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com> --- kas/kas-container | 159 ++++++++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 56 deletions(-) diff --git a/kas/kas-container b/kas/kas-container index 8fa2d16e..6b2131c3 100755 --- a/kas/kas-container +++ b/kas/kas-container @@ -2,7 +2,7 @@ # # kas - setup tool for bitbake based projects # -# Copyright (c) Siemens AG, 2018-2022 +# Copyright (c) Siemens AG, 2018-2024 # # Authors: # Jan Kiszka <jan.kiszka@siemens.com> @@ -27,13 +27,19 @@ set -e +KAS_IMAGE_VERSION_DEFAULT="4.5" +KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" +KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" +KAS_CONTAINER_SELF_NAME="$(basename "$0")" + usage() { - printf "%b" "Usage: $0 [OPTIONS] { build | shell } [KASOPTIONS] [KASFILE]\n" - printf "%b" " $0 [OPTIONS] { checkout | dump } [KASOPTIONS] [KASFILE]\n" - printf "%b" " $0 [OPTIONS] for-all-repos [KASOPTIONS] [KASFILE] COMMAND\n" - printf "%b" " $0 [OPTIONS] { clean | cleansstate | cleanall}\n" - printf "%b" " $0 [OPTIONS] menu [KCONFIG]\n" + SELF="${KAS_CONTAINER_SELF_NAME}" + printf "%b" "Usage: ${SELF} [OPTIONS] { build | shell } [KASOPTIONS] [KASFILE]\n" + printf "%b" " ${SELF} [OPTIONS] { checkout | dump } [KASOPTIONS] [KASFILE]\n" + printf "%b" " ${SELF} [OPTIONS] for-all-repos [KASOPTIONS] [KASFILE] COMMAND\n" + printf "%b" " ${SELF} [OPTIONS] { clean | cleansstate | cleanall} [KASFILE]\n" + printf "%b" " ${SELF} [OPTIONS] menu [KCONFIG]\n" printf "%b" "\nPositional arguments:\n" printf "%b" "build\t\t\tCheck out repositories and build target.\n" printf "%b" "checkout\t\tCheck out repositories but do not build.\n" @@ -80,6 +86,15 @@ usage() exit 1 } +fatal_error(){ + echo "${KAS_CONTAINER_SELF_NAME}: Error: $*" >&2 + exit 1 +} + +warning(){ + echo "${KAS_CONTAINER_SELF_NAME}: Warning: $*" >&2 +} + trace() { [ -n "${KAS_VERBOSE}" ] && echo "+ $*" >&2 @@ -113,7 +128,6 @@ enable_oe_mode() { run_clean() { if [ -n "${KAS_ISAR_ARGS}" ]; then - set_container_image_var # SC2086: Double quote to prevent globbing and word splitting. # shellcheck disable=2086 trace ${KAS_CONTAINER_COMMAND} run -v "${KAS_BUILD_DIR}":/build:rw \ @@ -135,10 +149,6 @@ run_clean() { fi } -KAS_IMAGE_VERSION_DEFAULT="4.0" -KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" -KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" - set_container_image_var() { KAS_IMAGE_VERSION="${KAS_IMAGE_VERSION:-${KAS_IMAGE_VERSION_DEFAULT}}" KAS_CONTAINER_IMAGE_NAME="${KAS_CONTAINER_IMAGE_NAME:-${KAS_CONTAINER_IMAGE_NAME_DEFAULT}}" @@ -168,14 +178,12 @@ if [ -z "${KAS_CONTAINER_ENGINE}" ]; then ;; *) # The docker command is an unknown engine - echo "$0: docker command found, but unknown engine detected" >&2 - exit 1 + fatal_error "docker command found, but unknown engine detected" esac elif command -v podman >/dev/null; then KAS_CONTAINER_ENGINE=podman else - echo "$0: no container engine found, need docker or podman" >&2 - exit 1 + fatal_error "no container engine found, need docker or podman" fi fi @@ -190,8 +198,7 @@ podman) KAS_RUNTIME_ARGS="${KAS_RUNTIME_ARGS} --security-opt label=disable" ;; *) - echo "$0: unknown container engine '${KAS_CONTAINER_ENGINE}'" >&2 - exit 1 + fatal_error "unknown container engine '${KAS_CONTAINER_ENGINE}'" ;; esac @@ -205,8 +212,7 @@ while [ $# -gt 0 ]; do --with-loop-dev) if ! KAS_LOOP_DEV=$(/sbin/losetup -f 2>/dev/null); then if [ "$(id -u)" -eq 0 ]; then - echo "Error: loop device not available!" - exit 1 + fatal_error "loop device not available!" fi sudo_command="/sbin/losetup -f" sudo_message="[sudo] enter password to setup loop" @@ -216,10 +222,9 @@ while [ $# -gt 0 ]; do # shellcheck disable=2086 if ! KAS_LOOP_DEV=$(sudo -p "$sudo_message" $sudo_command \ 2>/dev/null); then - echo "Error: loop device setup unsuccessful!" - echo "try calling '$sudo_command' with root" \ - "permissions manually." - exit 1 + fatal_error "loop device setup unsuccessful!" \ + "try calling '$sudo_command' with root" \ + "permissions manually." fi fi KAS_WITH_LOOP_DEV="--device ${KAS_LOOP_DEV}" @@ -236,6 +241,9 @@ while [ $# -gt 0 ]; do shift 2 ;; --ssh-agent) + if [ -z "${SSH_AUTH_SOCK}" ]; then + fatal_error "no SSH agent running" + fi KAS_SSH_AUTH_SOCK=$(readlink -fv "$SSH_AUTH_SOCK") shift 1 ;; @@ -274,16 +282,16 @@ while [ $# -gt 0 ]; do shift 2 ;; --version) - echo "$(basename "$0") $KAS_IMAGE_VERSION_DEFAULT" + echo "${KAS_CONTAINER_SELF_NAME} $KAS_IMAGE_VERSION_DEFAULT" exit 0 ;; --*) usage ;; clean|cleansstate|cleanall) - [ $# -eq 1 ] || usage - run_clean "$1" - exit 0 + KAS_CMD=$1 + shift 1 + break ;; shell) KAS_REPO_MOUNT_OPT_DEFAULT="rw" @@ -322,15 +330,21 @@ while [ $# -gt 0 ] && [ $KAS_EXTRA_BITBAKE_ARGS -eq 0 ]; do case "$1" in --skip|--target|--task) KAS_OPTIONS="${KAS_OPTIONS} $1 $2" - shift 2 + shift 1 + shift 1 || KAS_OPTIONS="--help" ;; -c|--cmd|--command) KAS_BITBAKE_C_OPTION_ARGS="$2" - shift 2 + shift 1 + shift 1 || KAS_OPTIONS="--help" ;; -E|--preserve-env) - echo "$1 is not supported with kas-container" - exit 1 + fatal_error "$1 is not supported with ${KAS_CONTAINER_SELF_NAME}" + ;; + --provenance) + KAS_OPTIONS="${KAS_OPTIONS} $1 $2" + shift 1 + shift 1 || KAS_OPTIONS="--help" ;; --) KAS_EXTRA_BITBAKE_ARGS=$# @@ -340,13 +354,23 @@ while [ $# -gt 0 ] && [ $KAS_EXTRA_BITBAKE_ARGS -eq 0 ]; do shift 1 ;; *) + ARG="$1" + shift 1 + if [ "$KAS_CMD" = "for-all-repos" ]; then + if [ $# -gt 0 ]; then + KAS_REPO_CMD="$1" + shift 1 + else + KAS_REPO_CMD="$ARG" + unset ARG + fi + fi KAS_FILES= # SC2086: Double quote to prevent globbing and word splitting. # shellcheck disable=2086 - for FILE in $(IFS=':'; echo $1); do + for FILE in $(IFS=':'; echo $ARG); do if ! KAS_REAL_FILE="$(realpath -qe "$FILE")"; then - echo "Error: configuration file '${FILE}' not found" - exit 1 + fatal_error "configuration file '${FILE}' not found" fi if [ -z "${KAS_FILES}" ]; then KAS_FIRST_FILE="${KAS_REAL_FILE}" @@ -355,11 +379,6 @@ while [ $# -gt 0 ] && [ $KAS_EXTRA_BITBAKE_ARGS -eq 0 ]; do KAS_FILES="${KAS_FILES}:${KAS_REAL_FILE}" fi done - shift 1 - if [ "$KAS_CMD" = "for-all-repos" ]; then - KAS_REPO_CMD="$1" - shift 1 - fi ;; esac done @@ -395,7 +414,7 @@ if [ "${KAS_CMD}" = "menu" ]; then set -- "$@" -e _KAS_REPO_DIR_HOST="$(readlink -fv "${KAS_REPO_DIR}")" fi - BUILD_SYSTEM=$(tr '\n' '\f' 2>/dev/null < ${KAS_FIRST_FILE} | \ + BUILD_SYSTEM=$(tr '\n' '\f' 2>/dev/null < "${KAS_FIRST_FILE}" | \ sed -e 's/\(.*\fconfig KAS_BUILD_SYSTEM\f\(.*\)\|.*\)/\2/' \ -e 's/\f\([[:alpha:]].*\|$\)//' \ -e 's/.*default \"\(.*\)\".*/\1/') @@ -416,18 +435,24 @@ fi set_container_image_var +# short circuit for clean* commands. We just need +# the build-system information, but no repo mounts, etc... +if echo "${KAS_CMD}" | grep -qe "^clean"; then + run_clean "${KAS_CMD}" + exit 0 +fi + KAS_REPO_MOUNT_OPT="${KAS_REPO_MOUNT_OPT:-${KAS_REPO_MOUNT_OPT_DEFAULT}}" KAS_FILES="$(echo "${KAS_FILES}" | sed 's|'"${KAS_REPO_DIR}"'/|/repo/|g')" if [ "$(id -u)" -eq 0 ] && [ "${KAS_ALLOW_ROOT}" != "yes" ] ; then - echo "Error: Running as root - may break certain recipes." - echo "Better give a regular user docker access. Set" \ - "KAS_ALLOW_ROOT=yes to override." - exit 1 + fatal_error "Running as root - may break certain recipes." \ + "Better give a regular user docker access. Set" \ + "KAS_ALLOW_ROOT=yes to override." fi -set -- "$@" -v "${KAS_REPO_DIR}":/repo:${KAS_REPO_MOUNT_OPT} \ +set -- "$@" -v "${KAS_REPO_DIR}:/repo:${KAS_REPO_MOUNT_OPT}" \ -v "${KAS_WORK_DIR}":/work:rw -e KAS_WORK_DIR=/work \ -v "${KAS_BUILD_DIR}":/build:rw \ --workdir=/repo \ @@ -436,16 +461,14 @@ set -- "$@" -v "${KAS_REPO_DIR}":/repo:${KAS_REPO_MOUNT_OPT} \ if [ -n "${KAS_SSH_DIR}" ] ; then if [ ! -d "${KAS_SSH_DIR}" ]; then - echo "Passed KAS_SSH_DIR '${KAS_SSH_DIR}' is not a directory" - exit 1 + fatal_error "passed KAS_SSH_DIR '${KAS_SSH_DIR}' is not a directory" fi set -- "$@" -v "$(readlink -fv "${KAS_SSH_DIR}")":/var/kas/userdata/.ssh:ro fi if [ -n "${KAS_SSH_AUTH_SOCK}" ]; then if [ ! -S "${KAS_SSH_AUTH_SOCK}" ]; then - echo "Passed SSH_AUTH_SOCK '${KAS_SSH_AUTH_SOCK}' is not a socket" - exit 1 + fatal_error "passed SSH_AUTH_SOCK '${KAS_SSH_AUTH_SOCK}' is not a socket" fi set -- "$@" -v "${KAS_SSH_AUTH_SOCK}":/ssh-agent/ssh-auth-sock \ -e SSH_AUTH_SOCK=/ssh-agent/ssh-auth-sock @@ -453,20 +476,27 @@ fi if [ -n "${KAS_AWS_DIR}" ] ; then if [ ! -d "${KAS_AWS_DIR}" ]; then - echo "Passed KAS_AWS_DIR '${KAS_AWS_DIR}' is not a directory" - exit 1 + fatal_error "passed KAS_AWS_DIR '${KAS_AWS_DIR}' is not a directory" fi set -- "$@" -v "$(readlink -fv "${KAS_AWS_DIR}")":/var/kas/userdata/.aws:ro \ -e AWS_CONFIG_FILE="${AWS_CONFIG_FILE:-/var/kas/userdata/.aws/config}" \ -e AWS_SHARED_CREDENTIALS_FILE="${AWS_SHARED_CREDENTIALS_FILE:-/var/kas/userdata/.aws/credentials}" fi +if [ -n "${AWS_WEB_IDENTITY_TOKEN_FILE}" ] ; then + if [ ! -f "${AWS_WEB_IDENTITY_TOKEN_FILE}" ]; then + echo "Passed AWS_WEB_IDENTITY_TOKEN_FILE '${AWS_WEB_IDENTITY_TOKEN_FILE}' is not a directory" + exit 1 + fi + set -- "$@" -v "$(readlink -fv "${AWS_WEB_IDENTITY_TOKEN_FILE}")":/var/kas/userdata/.aws/web_identity_token:ro \ + -e AWS_WEB_IDENTITY_TOKEN_FILE="${AWS_CONFIG_FILE:-/var/kas/userdata/.aws/web_identity_token}" \ + -e AWS_ROLE_ARN="${AWS_ROLE_ARN}" +fi KAS_GIT_CREDENTIAL_HELPER_DEFAULT="" if [ -n "${KAS_GIT_CREDENTIAL_STORE}" ] ; then if [ ! -f "${KAS_GIT_CREDENTIAL_STORE}" ]; then - echo "Passed KAS_GIT_CREDENTIAL_STORE '${KAS_GIT_CREDENTIAL_STORE}' is not a file" - exit 1 + fatal_error "passed KAS_GIT_CREDENTIAL_STORE '${KAS_GIT_CREDENTIAL_STORE}' is not a file" fi KAS_GIT_CREDENTIAL_HELPER_DEFAULT="store --file=/var/kas/userdata/.git-credentials" set -- "$@" -v "$(readlink -fv "${KAS_GIT_CREDENTIAL_STORE}")":/var/kas/userdata/.git-credentials:ro @@ -483,6 +513,16 @@ if [ -f "${NETRC_FILE}" ]; then -e NETRC_FILE="/var/kas/userdata/.netrc" fi +if [ -f "${GITCONFIG_FILE}" ]; then + set -- "$@" -v "$(readlink -fv "${GITCONFIG_FILE}")":/var/kas/userdata/.gitconfig:ro \ + -e GITCONFIG_FILE="/var/kas/userdata/.gitconfig" +fi + +if [ -f "${REGISTRY_AUTH_FILE}" ]; then + set -- "$@" -v "$(readlink -fv "${REGISTRY_AUTH_FILE}")":/var/kas/userdata/.docker/config.json:ro \ + -e REGISTRY_AUTH_FILE="/var/kas/userdata/.docker/config.json" +fi + if [ -t 1 ]; then set -- "$@" -t -i fi @@ -500,18 +540,24 @@ if [ -n "${SSTATE_DIR}" ]; then -v "$(readlink -fv "${SSTATE_DIR}")":/sstate:rw \ -e SSTATE_DIR=/sstate fi +if [ -n "${SSTATE_MIRRORS}" ]; then + if echo "${SSTATE_MIRRORS}" | grep -q "file:///"; then + warning "SSTATE_MIRRORS contains a local path." \ + "Make sure to make this path available inside the container." + fi + set -- "$@" -e "SSTATE_MIRRORS=${SSTATE_MIRRORS}" +fi if [ -n "${KAS_REPO_REF_DIR}" ]; then if [ ! -d "${KAS_REPO_REF_DIR}" ]; then - echo "Passed KAS_REPO_REF_DIR '${KAS_REPO_REF_DIR}' is not a directory" - exit 1 + fatal_error "Passed KAS_REPO_REF_DIR '${KAS_REPO_REF_DIR}' is not a directory" fi set -- "$@" \ -v "$(readlink -fv "${KAS_REPO_REF_DIR}")":/repo-ref:rw \ -e KAS_REPO_REF_DIR=/repo-ref fi -for var in TERM KAS_DISTRO KAS_MACHINE KAS_TARGET KAS_TASK \ +for var in TERM KAS_DISTRO KAS_MACHINE KAS_TARGET KAS_TASK KAS_CLONE_DEPTH \ KAS_PREMIRRORS DISTRO_APT_PREMIRRORS BB_NUMBER_THREADS PARALLEL_MAKE \ GIT_CREDENTIAL_USEHTTPPATH; do if [ -n "$(eval echo \$${var})" ]; then @@ -559,4 +605,5 @@ while [ $KAS_EXTRA_BITBAKE_ARGS -gt 0 ]; do KAS_EXTRA_BITBAKE_ARGS=$((KAS_EXTRA_BITBAKE_ARGS - 1)) done +# shellcheck disable=SC2086 trace ${KAS_CONTAINER_COMMAND} run "$@" -- 2.39.2 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240923125127.150443-2-cedric.hombourger%40siemens.com. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] meta-isar: add support for Ubuntu 24.04 (noble) 2024-09-23 12:51 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 1/2] kas: update kas-container to version 4.5 'Cedric Hombourger' via isar-users @ 2024-09-23 12:51 ` 'Cedric Hombourger' via isar-users 2024-10-21 10:50 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble Uladzimir Bely 2 siblings, 0 replies; 6+ messages in thread From: 'Cedric Hombourger' via isar-users @ 2024-09-23 12:51 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com> --- doc/user_manual.md | 1 + meta-isar/conf/distro/ubuntu-common.inc | 5 ++++- meta-isar/conf/distro/ubuntu-noble-ports.list | 6 ++++++ meta-isar/conf/distro/ubuntu-noble.conf | 12 ++++++++++++ meta-isar/conf/distro/ubuntu-noble.list | 6 ++++++ meta-isar/conf/machine/qemuarm64.conf | 1 + meta-isar/conf/mc.conf | 2 ++ meta-isar/conf/multiconfig/qemuamd64-noble.conf | 7 +++++++ meta-isar/conf/multiconfig/qemuarm64-noble.conf | 7 +++++++ .../lib/wic/plugins/source/bootimg-efi-isar.py | 3 ++- 10 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-noble-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-noble.conf create mode 100644 meta-isar/conf/distro/ubuntu-noble.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-noble.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-noble.conf diff --git a/doc/user_manual.md b/doc/user_manual.md index 706c74bf..847f4b07 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -455,6 +455,7 @@ following distros: - debian-trixie (host >= bookworm) - ubuntu-focal - ubuntu-jammy (requires host dpkg >= 1.21) + - ubuntu-noble (requires host dpkg >= 1.21) - raspios-bullseye User can select appropriate distro for specific machine by setting the following variable in machine configuration file: diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 232bee35..884f7a7a 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -31,7 +31,10 @@ DISTRO_KERNELS ?= " \ IMAGE_PREINSTALL += "init" IMAGE_PREINSTALL += "initramfs-tools" -IMAGER_INSTALL:wic += "python3-distutils" +UBUNTU_WIC_DEPS = "" +UBUNTU_WIC_DEPS:focal = "python3-distutils" +UBUNTU_WIC_DEPS:jammy = "python3-distutils" +IMAGER_INSTALL:wic += "${UBUNTU_WIC_DEPS}" SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" diff --git a/meta-isar/conf/distro/ubuntu-noble-ports.list b/meta-isar/conf/distro/ubuntu-noble-ports.list new file mode 100644 index 00000000..adeb2639 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble-ports.list @@ -0,0 +1,6 @@ +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-noble.conf b/meta-isar/conf/distro/ubuntu-noble.conf new file mode 100644 index 00000000..531f085f --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble.conf @@ -0,0 +1,12 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +require conf/distro/ubuntu-common.inc + +BASE_DISTRO_CODENAME = "noble" + +DISTRO_GCC = "13" + +DEBIAN_COMPAT = "13" diff --git a/meta-isar/conf/distro/ubuntu-noble.list b/meta-isar/conf/distro/ubuntu-noble.list new file mode 100644 index 00000000..91393a21 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-noble.list @@ -0,0 +1,6 @@ +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 9706bbe0..d3403303 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -6,6 +6,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME:ubuntu-focal ?= "generic" KERNEL_NAME:ubuntu-jammy ?= "generic" +KERNEL_NAME:ubuntu-noble ?= "generic" IMAGE_FSTYPES ?= "ext4" ROOTFS_EXTRA ?= "128" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index d8c3a3a7..212d3e4d 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -61,6 +61,8 @@ BBMULTICONFIG = " \ starfive-visionfive2-sid \ qemuarm64-focal \ qemuarm64-jammy \ + qemuarm64-noble \ qemuamd64-focal \ qemuamd64-jammy \ + qemuamd64-noble \ " diff --git a/meta-isar/conf/multiconfig/qemuamd64-noble.conf b/meta-isar/conf/multiconfig/qemuamd64-noble.conf new file mode 100644 index 00000000..e052eff1 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-noble.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "ubuntu-noble" diff --git a/meta-isar/conf/multiconfig/qemuarm64-noble.conf b/meta-isar/conf/multiconfig/qemuarm64-noble.conf new file mode 100644 index 00000000..b87df1b6 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-noble.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "ubuntu-noble" diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 4bfb70a0..079b70d6 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -414,7 +414,8 @@ class BootimgEFIPlugin(SourcePlugin): grub_target = 'x86_64-efi' grub_image = "bootx64.efi" grub_modules = "multiboot efi_uga iorw ata " - if get_bitbake_var("DISTRO").startswith("ubuntu"): + if get_bitbake_var("DISTRO").startswith("ubuntu") and \ + os.path.exists('/usr/lib/grub/x86_64-efi/linuxefi.mod'): grub_modules += "linuxefi " elif distro_arch == "i386": grub_target = 'i386-efi' -- 2.39.2 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240923125127.150443-3-cedric.hombourger%40siemens.com. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 2024-09-23 12:51 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 1/2] kas: update kas-container to version 4.5 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 2/2] meta-isar: add support for Ubuntu 24.04 (noble) 'Cedric Hombourger' via isar-users @ 2024-10-21 10:50 ` Uladzimir Bely 2 siblings, 0 replies; 6+ messages in thread From: Uladzimir Bely @ 2024-10-21 10:50 UTC (permalink / raw) To: Cedric Hombourger, isar-users On Mon, 2024-09-23 at 14:51 +0200, 'Cedric Hombourger' via isar-users wrote: > Changes compared to v1: > - upgrade kas-container to version 4.5 as recommended by Felix > > Cedric Hombourger (2): > kas: update kas-container to version 4.5 > meta-isar: add support for Ubuntu 24.04 (noble) > > doc/user_manual.md | 1 + > kas/kas-container | 159 ++++++++++++---- > -- > meta-isar/conf/distro/ubuntu-common.inc | 5 +- > meta-isar/conf/distro/ubuntu-noble-ports.list | 6 + > meta-isar/conf/distro/ubuntu-noble.conf | 12 ++ > meta-isar/conf/distro/ubuntu-noble.list | 6 + > meta-isar/conf/machine/qemuarm64.conf | 1 + > meta-isar/conf/mc.conf | 2 + > .../conf/multiconfig/qemuamd64-noble.conf | 7 + > .../conf/multiconfig/qemuarm64-noble.conf | 7 + > .../wic/plugins/source/bootimg-efi-isar.py | 3 +- > 11 files changed, 151 insertions(+), 58 deletions(-) > create mode 100644 meta-isar/conf/distro/ubuntu-noble-ports.list > create mode 100644 meta-isar/conf/distro/ubuntu-noble.conf > create mode 100644 meta-isar/conf/distro/ubuntu-noble.list > create mode 100644 meta-isar/conf/multiconfig/qemuamd64-noble.conf > create mode 100644 meta-isar/conf/multiconfig/qemuarm64-noble.conf > > -- > 2.39.2 > Applied to next, thanks. -- Best regards, Uladzimir. -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/c526d8f57f1b90c530c7aaf3fc07cc9f537e292c.camel%40ilbers.de. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-21 10:51 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-09-23 12:39 [PATCH] meta-isar: add support for Ubuntu 24.04 (noble) 'Cedric Hombourger' via isar-users 2024-09-23 12:43 ` 'MOESSBAUER, Felix' via isar-users 2024-09-23 12:51 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 1/2] kas: update kas-container to version 4.5 'Cedric Hombourger' via isar-users 2024-09-23 12:51 ` [PATCH v2 2/2] meta-isar: add support for Ubuntu 24.04 (noble) 'Cedric Hombourger' via isar-users 2024-10-21 10:50 ` [PATCH v2 0/2] add support for Ubuntu 24.04 (noble Uladzimir Bely
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox