From patchwork Mon Sep 23 12:39:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "cedric.hombourger@siemens.com" X-Patchwork-Id: 3827 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 23 Sep 2024 14:39:37 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48NCda7V002294 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Sep 2024 14:39:36 +0200 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6c3580b7cf5sf64623926d6.3 for ; Mon, 23 Sep 2024 05:39:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727095170; cv=pass; d=google.com; s=arc-20240605; b=iyHk1sc5GGu6n5TxBeBt/6ay5462aQCwkmr1+tHxWVgqwrdZvi+rkB4CQu4ZfzCuwn XdsEZc3OIaaZkqy0Vvz8N6B6TCuBLwbnejVJkzPko422hO1pR94U4yFfcOlyCcsKKhq0 GfmFQUoyRBi8pL9YE/LefEJj59p/+e3FdQgqjV134qJXl2b5EmhP0G2HPEBKDdkdG/w4 i9TOkqIbbEwmqe4m5ug1kpsvZBxzeU5XUxg3bUIQkCoQVWZPCPVoJoOwHUcpFFRXAdj8 ohr+GtDS4uhxecwJjARs1liZ0POgEim+QwtFPK+OgbLzDm2jw4LfK/brKOCPZ+67C2CR kYNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Tqu1Kov5cttVa1u2bZX0WpWoS230JEV9/ppN/7OhjO8=; fh=jzPOUZ4VPiO5slTsDvzSLWu1VgcEe6WX4Huiu7lNNDc=; b=brueCsAjYB0wdKm/ELL3qK5ugM7E8+bZDtFq3bfYlAl0HHyVczRdRZa1C11Zsh7kmv JFeG9Q4BlWVV0PXEnAwbqur+HKvhk4esfWXrmkKdHX++7pkvaJwP4gc18WrfganEQkKX fgIRiF36WKkWzf9F/YmjMIZzMeENKUE5S0dUr942xIrjOgQQVCkqXDkJm2krog+Gvyrr bJtAIfH0vQaHxzkoY0mDOlTgzfSEcxvxPg8oMUmQaHB5AtHc1nzw/5gvKN/hNfRDZsbx iPWk5PIEcw8ZSUdRziudhOF+UksZFy+XwU6is4XMJgpey0Oo4yI9hC5HZxLqlfe+0zfV dh6Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=B+2R18UP; spf=pass (google.com: domain of fm-1212295-2024092312392864b3872df64a491e28-ms_bha@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-2024092312392864b3872df64a491e28-MS_bHA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1727095170; x=1727699970; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Tqu1Kov5cttVa1u2bZX0WpWoS230JEV9/ppN/7OhjO8=; b=QfQ7pqJvGjK5HwhIw+DPJsqRchGit0Kn9U6tDvUPPw4yRRsBXk31y+gYu3s70KNTlf n4KXblV+fpeVdOJkpShTX7WBoeVyI7dH9T8PKXGqXMr1t7rjZLGTN+iDl0fTmPLilCif iBAVZrvUChA/ImValkHM7dU9T2xKAKJJQDFYorL/4SDjUZVeEdFuGZVn5x8ViuPs4DJq HW75U8wYFI9fkVGYj+/K4JMd4lsoSvGWE264h8mDsU4wcv3IXaiwyxs3hLrAI2jC07bF zQ0OZN7+oPCEth5Ac9CmjiMY3j/DOGizmOIrHlUVYA97wFs3zV7BHSbZMa/Cock1zvF3 VYTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727095170; x=1727699970; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Tqu1Kov5cttVa1u2bZX0WpWoS230JEV9/ppN/7OhjO8=; b=cyUw4x+CMLXM6zvkTvYLTEB49q3WBz59EI61DL6un0rtGxjQOjtPNQI08HpIEcHvjX Neh5uX64TqhRgRzEQG3PxmykJhnR31uV9Jxpq++PZbw3nTRu2qCbQc8qZaR26M7+9sKq WY8ElbqbdtBSY+Em3ProMUkFiG905Ga4Jeqla8gBoP9tjzNWwaQpOlPYYP/h5lQGVugL 6Qk6aj2h4SiTlRzgj0aYdLONLYFHux/2gL+ykrhLabqhGLmUDLDbrOpqS1S0amNTSAZE tjhj5QXPo8F8rM/KH0pJ7oTJkQlAu8p+raD9TvdtQdkYPTQ2BDZbx6kpEOzZ9MBjWZTs jZHg== X-Forwarded-Encrypted: i=2; AJvYcCUrwEjVXA1YQZM6XObIc8uP3GjDiZzGqLWGf+INJjIHdUSdazGFUWUWPYaIsfzaAfYFZ+kIRkA=@isar-build.org X-Gm-Message-State: AOJu0YzlWTvctcKnwByvcUEGL8AR8DSTDsPGmDuE/271G2ywF+oAe89H RMG3w+RxezAQ4xQSM97Z0RzpO5HA7P+ZLas+P1XBuW6HfGuwcPm4 X-Google-Smtp-Source: AGHT+IFejF1Jz88/pDNwLJDsr1hRjml9KlLCE1qAeK5jtYlWhgiIge+wRmalibUfXnoXUUmwnnyOBA== X-Received: by 2002:a0c:eb49:0:b0:6c7:c5b5:f576 with SMTP id 6a1803df08f44-6c7c5b621acmr111334586d6.20.1727095170200; Mon, 23 Sep 2024 05:39:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5b88:0:b0:6bf:60fd:c203 with SMTP id 6a1803df08f44-6c69bbce690ls81051446d6.1.-pod-prod-05-us; Mon, 23 Sep 2024 05:39:29 -0700 (PDT) X-Received: by 2002:a05:6214:4886:b0:6c5:aab1:4f04 with SMTP id 6a1803df08f44-6c7bc71f0ddmr216219216d6.28.1727095169518; Mon, 23 Sep 2024 05:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727095169; cv=none; d=google.com; s=arc-20240605; b=ettfqZXJYygpnDuFPUNa2QZYcJIWdbCw0/RsvgwbowKYfEoQ0NjvqOdnJl7LUDfiJo oHhsYSfXyAf1FOZFqjcKFUUx8PkizsfAWJaDAxrOiN/gAbxqZnOLDF3dwGgwbQeDUgMC LtBax4JM4XHm7hHzAl1R4nV4NlZf6EiuBwN7IyQ677rjl0L4OA1+u+bBcywmkOzkwplV xkH7HYdtIVb2Q7CkGnpER0lf9TW3NsDT7Z0hQ2BdHr+zjigUStWSBWH+pNY+aKyJUvAI +LbSp6YTFX1vHFw+sOcF/fCNfpfHZa+GmTUc+ZyWzQYdSagEk5ak7hzK0Exl/BCf6Ac4 1n7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=PhakfR45gqrd/+70wplBb9TuHyCGfUldtuhvPQRtG14=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=Ax34IhqzAkCJdFaf6M+jU31lpxp4o8Ig95gD7jAisYEVhJFQnmehCwj11ei61dMrZ9 myqAi5hxDbBRINc/UFJ3aSkmnxLEz0+WNka1TfcTn6lrNxgoHpX4FIw04gs+Aakf2oWl +NBHOy8a+Zs9UchjoRpNd7eI86VMWSbhXROIWS0Dd1qYNQGERKkbyLoQ10xZzVTFwkAa dYVP1V1HFnI1szpkhQTzef6Dom6aTfWO5YetbVCNOVfwye+5t51AT+QmDsP3gIs20e7R mkXpmM/N5DH3ySGVgCqlRUSKdO8MHxPyL1Qgdhp8OhT6ka9frVQ4MVqhJSC4dKpTgZpP Rw2w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=B+2R18UP; spf=pass (google.com: domain of fm-1212295-2024092312392864b3872df64a491e28-ms_bha@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-2024092312392864b3872df64a491e28-MS_bHA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-6c75e585886si3322196d6.5.2024.09.23.05.39.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Sep 2024 05:39:29 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-2024092312392864b3872df64a491e28-ms_bha@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024092312392864b3872df64a491e28 for ; Mon, 23 Sep 2024 14:39:28 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: "cedric.hombourger@siemens.com" To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH] meta-isar: add support for Ubuntu 24.04 (noble) Date: Mon, 23 Sep 2024 14:39:14 +0200 Message-Id: <20240923123914.150282-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=B+2R18UP; spf=pass (google.com: domain of fm-1212295-2024092312392864b3872df64a491e28-ms_bha@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-2024092312392864b3872df64a491e28-MS_bHA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Signed-off-by: Cedric Hombourger --- 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'