From patchwork Mon May 22 04:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2819 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 22 May 2023 06:58:18 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f56.google.com (mail-ed1-f56.google.com [209.85.208.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34M4wHkv012499 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 06:58:17 +0200 Received: by mail-ed1-f56.google.com with SMTP id 4fb4d7f45d1cf-512937f82b2sf1587342a12.2; Sun, 21 May 2023 21:58:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684731492; cv=pass; d=google.com; s=arc-20160816; b=M6gHv6wjhHtM3uhxTPgFn6e0enIBR6/l40dDwjglz0D1AZladTy41o0otjy1lgKSXj hcESMcBLigqdpkiVJmFxqzz12eYFLu+7qiuuvcrVM+s2HPeJFX1ezGTfwX84UqIGoTnF 9chY+Nw2LfymIBzePfW/i4L0jAMC+o/GrNmtiIQyCp2tn7ruMLmKBRqbdSr6MzdO0Cnf W3Pm458+8XFSxftGEMFsaS+fb53zZgPcngN19JqbT8UbyTkOIjddKxFvU2rS+9dx7YUU Jp71jRgUs4jsdSEn6DB/XJGSb9/5YK2EG1S58lzHJG3tJHYhIaFlVPE8ndYpXHV9GQ9c PWOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=1rwlHsNThhczxpzDGdMZxq6mIvDKozT8Abq9Xe2U71A=; b=llYTOpLJa+71rEJHrTmaLXhVswzbdU74bxZ2LV/+QXD6H5tLGMfTZ1/azGIIZFJsbM /zTOwBQqgzn32KD+nett/OgYifqxmxT3Wmy/tJO9tWgnYRWoDbORV9oVQ5VTpo8Cgim0 /773nOS3FKoSViLi7WS0dqriSt5WrhrNcpV+k5N6r5ai5AT0efesWWotwVGbDD1IOCrN LvyaZOU9zrAPFAghN5iYqjC6xYw9esC2b68mjEFvzul/xQjBf8y9mQK2hxdgx9ByMmsu WEnqKHF5BLIh1fcWBO2aO9Cap5yDN+6jkqMxbZPBIC0VY90++I0S6cyA77j3LntHESrH fdyA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684731492; x=1687323492; 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=1rwlHsNThhczxpzDGdMZxq6mIvDKozT8Abq9Xe2U71A=; b=Pt2PmWDCuA762EfKyQmM/RrbId7fQ3cMbG/MrnaCfEo2Yb5mthbu4Vr+xTP1qKQ3rF bnAf/NNWzE13EtinmWBcNRFdl4XJJMz9oBGSpDmt7UPolVF1zn7ZGIxuxZgwTYpwkpy1 fp4mlHTpfqRGryphK2+1Wh3SiqV3MVtd0PitkJOFUaAnkDtHEdnmIChgM+62gTIF1pwC DaSbS4vPr3lMFgIGiUFQUz5jpXiz9PkCCF+bYqcXhIzBLdI4+rgaGgsQXB+cOt4Hq94m knugaJ3iiWoFkmO5JyFCgPJvnHR60mqF9qaWkhFtVrgNiSh6/ZtPmZ0FdO4MZZdlOTD3 SR3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684731492; x=1687323492; 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=1rwlHsNThhczxpzDGdMZxq6mIvDKozT8Abq9Xe2U71A=; b=I6RlNWJtpIISLvGbAYSLFd+ZzebfXCJLuxrMmrkV4Fkeg0NBXtj21OfwurYSrDGuX0 cri++AgsvHzrssrSYRq+yHYkWwsElGjOiMUfKjMt4E0rIOkc/91tVD6Mkd0fqFifVUtT Q9xthJdaUaqGF4H9nCsi7Uk9FLetZAvcSIkFrfmk9354beuPvLi2ddegBzMYV4CM+wv6 vZ2KRjKnCgjbwzRUNsLu3bwiQaWYJ/hE+uaUJK85cknE20qfKR/0nTzQIPIUsvl3xptz e4LfTZUF8DDfD9Fk/PZXx0IE7YoGBfun/AKqiTUkHJNHOEtyLGvJmudb6OGx7/mWP/az yu4Q== X-Gm-Message-State: AC+VfDxw907K+Ha4QAQkxu7dYyX2niqkVmSqu4YdmTmJoW31vFeeVWtX wC7oRTDuRCuicLe0mfvXoeI= X-Google-Smtp-Source: ACHHUZ5HxhAveILsh0Dxww183YBaw0Q6fqiGTFhrON54itgwbuV/2SXih7MTdrmu1BUPPXab+mubjw== X-Received: by 2002:a17:906:5dac:b0:965:9445:ee11 with SMTP id n12-20020a1709065dac00b009659445ee11mr2602827ejv.4.1684731491480; 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-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 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; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230522045809233c9333021eac78d8 for ; Mon, 22 May 2023 06:58:09 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-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 X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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?= 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"