From: "'Cedric Hombourger' via isar-users" <isar-users@googlegroups.com>
To: isar-users@googlegroups.com
Cc: Cedric Hombourger <cedric.hombourger@siemens.com>
Subject: [PATCH] meta-isar: add support for Ubuntu 24.04 (noble)
Date: Mon, 23 Sep 2024 14:39:14 +0200 [thread overview]
Message-ID: <20240923123914.150282-1-cedric.hombourger@siemens.com> (raw)
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.
next reply other threads:[~2024-09-23 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-23 12:39 'Cedric Hombourger' via isar-users [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240923123914.150282-1-cedric.hombourger@siemens.com \
--to=isar-users@googlegroups.com \
--cc=cedric.hombourger@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox