From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7235866641536385024 X-Received: by 2002:a50:d4d5:0:b0:50b:c3bb:6082 with SMTP id e21-20020a50d4d5000000b0050bc3bb6082mr3824115edj.3.1684731491616; Sun, 21 May 2023 21:58:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d70e:0:b0:50d:9f1b:98d5 with SMTP id t14-20020aa7d70e000000b0050d9f1b98d5ls1381037edq.1.-pod-prod-02-eu; Sun, 21 May 2023 21:58:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4VmsdOyNoRP3eOhM43gm/aWh8cH1sWvB/T9NWjH8669w0viJMjdJhHPgcJ57vhs/zGQCgg X-Received: by 2002:a17:907:6e92:b0:96a:3811:f589 with SMTP id sh18-20020a1709076e9200b0096a3811f589mr10899979ejc.10.1684731489870; Sun, 21 May 2023 21:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684731489; cv=none; d=google.com; s=arc-20160816; b=NpmeWw054XfaIxherM0ojnpyBFhHwqz5pZwieetoeXVn5HPMnWr7iCx0dsCmcdWss2 R/t7slllrR//073oVj5DVHUNvfX7Sr1KeaGijPdUneXIG1hFy3ppyR2Jv71A/SJobQtx Angh8uD+yTq69WxryCuKf9RXpPSxUlY30H6iqGUEQdyfZhiyjTfmNt8u8pjtIgzlpncS ZaMETQt2UK+TTQW4szdAFb17mC5lnEVoFmTIDMBJgSANhV2SKNjia25FOzZZE9vGHcCO UJ/vVfJC065Fg9WAEq9xWIN7D664DIhjaxBvQq9ORN3Wl4rVnAIyfCiwFMxmT1t+jex3 3I5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=tdliSxsDO61KMR8dGctNsf5+viaVVgcD9gdo+aPeiog=; b=UhPJBpaKDQRs7CipV6BnzwgIv/Y6MvKEfXyAD7LYd1FufGUzfaI2dtbRdFOsCT+v03 N4i0sm4Lxogw4xkSsE56v8PzmZBsHWune8r9PeWcnSXPR45cBOAl1dmGKH6ZiCPLNlXi pOcBOXWllM4TBHf/abDmvvz4YymlUze342AOe9SKYjBXtsWPRFkYRoatw+0vBcofIjO/ 2XLwoOAefCAvHk2Das2/1X8zuTK8zCDTgN5eOU60ZLhlNSMgVBwTAgCwP7lmJVUwXSmA EYwmITQ6wC+zgOf9dJZpKKmdokfdG08d1NgzafIqrb+Y4s+0Cj3a5Dm7QqgAzErdbgih MpBg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="CkNIp6/K"; spf=pass (google.com: domain of fm-72506-20230522045809233c9333021eac78d8-sufq1t@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230522045809233c9333021eac78d8-SUFQ1T@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id fl23-20020a1709072a9700b00965600719e4si334597ejc.1.2023.05.21.21.58.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 May 2023 21:58:09 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230522045809233c9333021eac78d8-sufq1t@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="CkNIp6/K"; spf=pass (google.com: domain of fm-72506-20230522045809233c9333021eac78d8-sufq1t@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230522045809233c9333021eac78d8-SUFQ1T@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230522045809233c9333021eac78d8 for ; Mon, 22 May 2023 06:58:09 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=tdliSxsDO61KMR8dGctNsf5+viaVVgcD9gdo+aPeiog=; b=CkNIp6/KOHnV4df0Ambcsk9eqxJG1C3E3im+ZukT9tjNJy+LAbTZcKo1sh0x3LNAsL/ZqT QxYKyUOJZahZercdH6FOi1t8yeg79q8SsoyCVP7QoztGK6i3aqxFDvA2W9z9EOsCqGveElj7 7DUG9V+F6ElexwXtlnx3HziIMeoVg=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 2/2] meta-isar: add support for ubuntu jammy Date: Mon, 22 May 2023 04:57:35 +0000 Message-Id: <20230522045735.3516572-2-felix.moessbauer@siemens.com> In-Reply-To: <20230522045735.3516572-1-felix.moessbauer@siemens.com> References: <20230522045735.3516572-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: V863GF4Qx0Qi This patch adds the ubuntu jammy distribution and extends the qemuamd64 and qemuarm64 machine configs to support that version. Multiconfig entries are added as well. As ubuntu jammy uses zstd compression for the .deb files, the bootstrapping requires host dpkg >= 1.21, which is shipped from debian bookworm on. This note is added to the user docs. No test is added because of the special host tooling requirements. Signed-off-by: Felix Moessbauer --- doc/user_manual.md | 1 + meta-isar/conf/distro/ubuntu-jammy-ports.list | 6 ++++++ meta-isar/conf/distro/ubuntu-jammy.conf | 10 ++++++++++ meta-isar/conf/distro/ubuntu-jammy.list | 6 ++++++ meta-isar/conf/local.conf.sample | 2 ++ meta-isar/conf/machine/qemuamd64.conf | 3 +++ meta-isar/conf/machine/qemuarm64.conf | 1 + meta-isar/conf/multiconfig/qemuamd64-jammy.conf | 9 +++++++++ meta-isar/conf/multiconfig/qemuarm64-jammy.conf | 7 +++++++ 9 files changed, 45 insertions(+) create mode 100644 meta-isar/conf/distro/ubuntu-jammy-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-jammy.conf create mode 100644 meta-isar/conf/distro/ubuntu-jammy.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-jammy.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-jammy.conf diff --git a/doc/user_manual.md b/doc/user_manual.md index 60b7ca92..120cfebd 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -432,6 +432,7 @@ In Isar, each machine can use its specific Linux distro to generate `buildchroot - debian-bullseye - debian-bookworm - ubuntu-focal + - ubuntu-jammy (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-jammy-ports.list b/meta-isar/conf/distro/ubuntu-jammy-ports.list new file mode 100644 index 00000000..8aa8f73a --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-jammy-ports.list @@ -0,0 +1,6 @@ +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-jammy.conf b/meta-isar/conf/distro/ubuntu-jammy.conf new file mode 100644 index 00000000..ce6ae511 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-jammy.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +require conf/distro/ubuntu-common.inc + +BASE_DISTRO_CODENAME = "jammy" + +DISTRO_GCC = "11" diff --git a/meta-isar/conf/distro/ubuntu-jammy.list b/meta-isar/conf/distro/ubuntu-jammy.list new file mode 100644 index 00000000..ba5a04b5 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-jammy.list @@ -0,0 +1,6 @@ +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7e0184e4..090ac288 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -78,7 +78,9 @@ BBMULTICONFIG = " \ rpi-arm64-v8-bullseye \ sifive-fu540-sid-ports \ qemuarm64-focal \ + qemuarm64-jammy \ qemuamd64-focal \ + qemuamd64-jammy \ " # diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 0c768258..11842ec4 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -5,13 +5,16 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" KERNEL_NAME:ubuntu-focal ?= "generic" +KERNEL_NAME:ubuntu-jammy ?= "generic" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" WKS_FILE:ubuntu-focal ?= "sdimage-efi-sd" +WKS_FILE:ubuntu-jammy ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:remove:ubuntu-jammy = "${GRUB_BOOTLOADER_INSTALL}" WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs" IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 718e20f1..f3b379c8 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -5,6 +5,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME:ubuntu-focal ?= "generic" +KERNEL_NAME:ubuntu-jammy ?= "generic" IMAGE_FSTYPES ?= "ext4" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jammy.conf b/meta-isar/conf/multiconfig/qemuamd64-jammy.conf new file mode 100644 index 00000000..7dd395c2 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-jammy.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) Siemens AG, 2018-2022 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "ubuntu-jammy" + +IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/qemuarm64-jammy.conf b/meta-isar/conf/multiconfig/qemuarm64-jammy.conf new file mode 100644 index 00000000..be31426d --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-jammy.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "ubuntu-jammy" -- 2.34.1