From patchwork Mon Sep 23 12:51:27 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: 3829 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:51:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f186.google.com (mail-il1-f186.google.com [209.85.166.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48NCpi4l002488 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Sep 2024 14:51:44 +0200 Received: by mail-il1-f186.google.com with SMTP id e9e14a558f8ab-3a080ae776esf41171855ab.3 for ; Mon, 23 Sep 2024 05:51:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727095898; cv=pass; d=google.com; s=arc-20240605; b=XJ2pDDq2uK82XWWsGrZJFhuK7KrNkgmD/2owIkLd2+z31fl/r39B8LKZukjnLzHzWa 25hdxeyPw5bels0d/McdmHlnSmUO2ha9ywsZ21pQt1SsjKA7BGZEMHpdpGNZA/2bESik aFGuM5NSgCwGEaRIXQId+FYseq2+vZuhGU4HtjR8QSTgV6EunpEdPHypBJ8xA2ZgcYce Wb4zaiuhL/aR4a7jpw2Oj3FuPGHCHwJlt8PlfbdknY6Q1v+Ihzf6YugCVCzEXJ5yc39M 6HK1A9uBn7zkSn6Y9mrjWqtFSqN3o3KS+iF/1SKiGcnzz0hzOFRxRA5//yI7dDtYxqE1 e1jA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JsY4IC+cKTvk/hGq9EAj/hIBJV1OfX3v7IBk37oZwDY=; fh=gDkmcyfMSyF2U16d8f7zwfAJebn4PD8rXDGDyELEsP0=; b=EKRcEIGti57di+a9dnVb1U9wg9hXYq06fQ1p2xS5b8nU1K0pVNrkhWgMwQ2RRHV+KB e4xp/GDATiGdgNvEOl+cYUBR+Er8OKAboH+FAdEOEGxfoAXVxAbJ1YuKGWUPaXkA3jkB GjKntmJ7rpqrcm+JcoL3TrdG0vp9IWXa1tWfhYz0J4+LJxzhfPTvUgaaD31/+fkABtWA aPYcksrSpPYrX2dhD/j56oclvZBxcckCAMCVk4DZn4fi9OSMzPNWA3ePqgFx3lF/uTZJ LrZApLs7Awfa+klc/LRFgbRuKWE0uCyunDNSKPJPuC/ZvRUNV799vcLcwCyVuGhd70Ji vcPA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=YEmiLmcJ; spf=pass (google.com: domain of fm-1212295-20240923125135f2f74a7aafbf74940f-plradz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240923125135f2f74a7aafbf74940f-plRAdz@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=1727095898; x=1727700698; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=JsY4IC+cKTvk/hGq9EAj/hIBJV1OfX3v7IBk37oZwDY=; b=FmYMIkDyr+p4t47uoeP7AkJqRIC6eFbOqSniOjweJwXVF7Z3zTC5kRZIoAmeWu8tv1 dJy3nKOmbNcW68VPDl+8v80pgA0HO7+jLda0Dg9our2hohk4vYLAc+0/uowDwSA+ei6W nKb0ac5BnTcBp545YlGuQd/Zqyv2avAy2BkBh1ggkS+RnWT4E/40k8egUXy9wq63+men 2rYaWvgR0KNT9kqMzW2nnPTiwWL5Ylge/UxHBEEDRPeDmC8gTx+RD2IEtkPqxnEDc2cs D84nT/5IaULboxHK0hVDpYR3utzvsAZBz2Tg6TAB4+Ym20vJFmuzLSDeYlqxnLnjE+uJ cb+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727095898; x=1727700698; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JsY4IC+cKTvk/hGq9EAj/hIBJV1OfX3v7IBk37oZwDY=; b=jAUGeQBPxJeAQqXez6xSx/WBHZa4LMUvzHM6uPCkgk86JuxQ9tC9r+/ZSmgab2xuCJ 0R6t/ZDrma8eyjNqglLD9c4AoAAEItJ0vsqI77vSn6Tx/gZqVOZwqy4assi2E0DTAfq0 tO++7hzeTg6kXWbSjCTNdYIAWhWrEZR7lYesrZZ84p4xfM/xdATEa4rI0MFy4vR9Ffdy fJ4FRT2f6XO/CGfKZvsLgX8a2n3Xivf9jAFXmWSNaUqEDUF6sd01Ze0GxHBxRt69/f13 euOfC4KieXmPCJgaUEiqebPqQjhgemn91/JDidNNn8n3IDaXA8ujtGVxAKKHxvOraHB9 SrmQ== X-Forwarded-Encrypted: i=2; AJvYcCUlGT+u2izrozAMVLge+VgRQ7JcHZCzoTa+loIV5MgRpljd0KHgf3Ne1O5eJBv/ldVwiIwurbg=@isar-build.org X-Gm-Message-State: AOJu0YxinJlac5Q0Nt6M8sxcyOCNfRLyDZGTGdYp3s+GbHO3CZhJDYqs LQ1ptfxLa8pDIdw8amwSXlZV/4q2iaOynmqvyRJYY6NBoX0Gc8Hr X-Google-Smtp-Source: AGHT+IFLzzzOhSBiNMb/HAu8Q02uWJ3ewUOwJzQVtQ7xKXfhkMNaD4KLU4vi4Lw6AYfV5G5UHPxiIg== X-Received: by 2002:a05:6e02:1908:b0:3a0:9aef:4d0 with SMTP id e9e14a558f8ab-3a0c9cd091cmr99059885ab.5.1727095898138; Mon, 23 Sep 2024 05:51:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:c569:0:b0:3a0:bc89:614 with SMTP id e9e14a558f8ab-3a0bf2193efls434835ab.2.-pod-prod-07-us; Mon, 23 Sep 2024 05:51:37 -0700 (PDT) X-Received: by 2002:a05:6e02:1c4b:b0:3a0:8d2f:2914 with SMTP id e9e14a558f8ab-3a0c9d90babmr93650415ab.23.1727095897285; Mon, 23 Sep 2024 05:51:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727095897; cv=none; d=google.com; s=arc-20240605; b=bj9ARlcRL0qUnVhOhpPPmRdQKmnQ5QFw7Y1F6SbUYqReq/fubd2vM6GDisUSVDTfL9 Cliq/118YMGXRZPyDOizzlNNLHGSpopik1j2sRjDFlI2mCFpQAoSIG61++8/8hosrOGg aftpMUDAzbRagaPm/ALTRxJDof7BoI9YgfRkX5vcdMNoYtksBaBKVVNw8pd0JiTdoBvy DuavHhwhSHAaJ0PEWw6fRKosD3AmpERwHxNi+ULD9auJEH8VMWIM3nOIiBOzFnzhTSFX OVJh9f2QQHNrUB6hNUC4NwEj2W/gGmit0WZgai5O9YrZOyOzJQlZsccyR6XC/UkA2VgT w6Ug== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PhakfR45gqrd/+70wplBb9TuHyCGfUldtuhvPQRtG14=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=WgxwidfpofuJLlmCYHo6Mg0SjNhQJiMeZKOxDnZUqmKcDwZy5VmL/eXbBIspeEwgWW zjX5h1LfWhhuUAHlLnaQLFXTJGL6/3ai+XCwwqquasaQqMUseHIa4AJZ2Rvj2uEm2wJ6 JxVgb08eTkE+sHtBuMFnJcsuE2VhV+bX2jFUNBm8wzF/iUs9lTvA3diAhK+bWnr07T/8 a3EGS02V//aXeoLxUdEHGmFdnNxcGJTjoPyGkUrBkmGNdYvK7a4HRLMXGN9QRh1j9jvX 0tV+hVMckgJgda3kSUwMe0sDTbwk+hkSYHn2ZKlmdEYLaKkld0fc2e/hQXZR54uFUkj5 DMMg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=YEmiLmcJ; spf=pass (google.com: domain of fm-1212295-20240923125135f2f74a7aafbf74940f-plradz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240923125135f2f74a7aafbf74940f-plRAdz@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id e9e14a558f8ab-3a192a18630si1835775ab.3.2024.09.23.05.51.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Sep 2024 05:51:37 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20240923125135f2f74a7aafbf74940f-plradz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240923125135f2f74a7aafbf74940f for ; Mon, 23 Sep 2024 14:51:35 +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 v2 2/2] meta-isar: add support for Ubuntu 24.04 (noble) Date: Mon, 23 Sep 2024 14:51:27 +0200 Message-Id: <20240923125127.150443-3-cedric.hombourger@siemens.com> In-Reply-To: <20240923125127.150443-1-cedric.hombourger@siemens.com> References: <20240923125127.150443-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=YEmiLmcJ; spf=pass (google.com: domain of fm-1212295-20240923125135f2f74a7aafbf74940f-plradz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240923125135f2f74a7aafbf74940f-plRAdz@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'