From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7335026938539409408 X-Received: by 2002:a0c:e2cc:0:b0:686:ab05:59fb with SMTP id t12-20020a0ce2cc000000b00686ab0559fbmr10418488qvl.8.1707819043972; Tue, 13 Feb 2024 02:10:43 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:dc7:b0:68d:97d:785b with SMTP id 7-20020a0562140dc700b0068d097d785bls24667qvt.1.-pod-prod-08-us; Tue, 13 Feb 2024 02:10:43 -0800 (PST) X-Received: by 2002:a05:6214:29e9:b0:68c:b762:6f68 with SMTP id jv9-20020a05621429e900b0068cb7626f68mr769720qvb.4.1707819043467; Tue, 13 Feb 2024 02:10:43 -0800 (PST) Received: by 2002:a05:620a:4708:b0:785:a14c:1d29 with SMTP id af79cd13be357-7871b15bb77ms85a; Tue, 13 Feb 2024 02:09:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2+8twbtVIr4V3Xz1U4QS+UPMP5Nw0hnXW7lOeJLlU85h9w7t0IpXiTqUAwI220ji8sCEh X-Received: by 2002:a05:6512:3157:b0:511:627e:3840 with SMTP id s23-20020a056512315700b00511627e3840mr5254861lfi.27.1707818969743; Tue, 13 Feb 2024 02:09:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707818969; cv=none; d=google.com; s=arc-20160816; b=GxAaW2nQiNwfy70Ds6nQLbaQeqbPn6ZHpVqhauC6egNj6mxRtEI9XPjk6gZ3zfF2Cy i16svJfpTOcuM1HT4+mpZ/DiN3WcwEayPqyfOkUIHHcyg6XebdTydhELzvKkNKPsjKyP J+B9zeJarevz6vgQUIOBAEDsG+UGjbz98x2sCVAEFztPpGWxqiePoDWycdVv43+eUIIT 9B1N8Nwjbt3Vjz83X6dLzDDzywC2LeM4SJ3YGdOgPTYTX+AvNjtWXf7q/xhoCgQMfa2J ywgDslg6D054SozZqaVlnTg5F9n5IZzD7GBIbUbAj7kLyDcsQWWmbqS6VRJ1l235gOSo m61A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=RD/KtOw93R/vfDj9fXH8ADnaSVVrPjKoiMkUbJ/QanI=; fh=m/jjxtlxUhTkYmkLM8ahJk+CvivPxLiuNYfxh9oPu7o=; b=dL2+PNquouf5jd6iUgsqfLWpMFGNUby8CK1AjUXRjVRvTf7kI9fN6J2tBqqhQH/BW2 3m69RZu5G9hpzmE1jj2sq8rAieIg3A/vK+liP9Y77bpPVGylpx9ujo8Kag6+RIXRWVYu mLkIa/3UHX3gj1Wa4BdafGKpAeaUDmBBLwFPcLDK8NbdkPaME3rPODTMmg9WvdEnbchL qziIiIkRpnEsgkqAqkvMQVFZyASCF7hldS3zEvH35ly0Xi3nHGE2p++tfFoNaVAQd+rL Wlj8UioSLrHb1UVHarg2MpNPrm/+sU5Xm4DaQbHsbaGKz3RAlPkk09mIPU0e4IPL/6ia Itiw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=iskochilov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id i33-20020a0565123e2100b005116bbbbd07si512879lfv.12.2024.02.13.02.09.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Feb 2024 02:09:29 -0800 (PST) Received-SPF: pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=iskochilov@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 41DA9JhN010578 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Feb 2024 11:09:24 +0100 Received: from baighyz.m.ilbers.de (localhost [127.0.0.1]) by baighyz.m.ilbers.de (8.17.1.9/8.17.1.9/Debian-2) with ESMTPS id 41DA9JOr3787736 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 13 Feb 2024 10:09:19 GMT Received: (from iskochilov@localhost) by baighyz.m.ilbers.de (8.17.1.9/8.17.1.9/Submit) id 41DA9Jsn3787735; Tue, 13 Feb 2024 10:09:19 GMT From: Ilia Skochilov To: isar-users@googlegroups.com Cc: Ilia Skochilov Subject: [PATCH v2 4/4] Add bookworm support for RPI Date: Tue, 13 Feb 2024 10:06:59 +0000 Message-Id: <20240213100659.3770402-5-iskochilov@ilbers.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213100659.3770402-1-iskochilov@ilbers.de> References: <20240213100659.3770402-1-iskochilov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: Nvf21G0gfIx3 Add bookworm support for the RPI machines: - rpi-arm - rpi-arm-v7 - rpi-arm-v7l - rpi-arm64-v8 This patch also adds the new targets to "full" testsuite (test_nocross_rpi). Signed-off-by: Ilia Skochilov --- .../conf/distro/raspios-bookworm-64.list | 9 +++++++ meta-isar/conf/distro/raspios-bookworm.conf | 27 +++++++++++++++++++ meta-isar/conf/distro/raspios-bookworm.list | 5 ++++ meta-isar/conf/mc.conf | 4 +++ .../conf/multiconfig/rpi-arm-bookworm.conf | 5 ++++ .../conf/multiconfig/rpi-arm-v7-bookworm.conf | 5 ++++ .../multiconfig/rpi-arm-v7l-bookworm.conf | 5 ++++ .../multiconfig/rpi-arm64-v8-bookworm.conf | 5 ++++ testsuite/citest.py | 4 +++ 9 files changed, 69 insertions(+) create mode 100644 meta-isar/conf/distro/raspios-bookworm-64.list create mode 100644 meta-isar/conf/distro/raspios-bookworm.conf create mode 100644 meta-isar/conf/distro/raspios-bookworm.list create mode 100644 meta-isar/conf/multiconfig/rpi-arm-bookworm.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm-v7-bookworm.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm-v7l-bookworm.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm64-v8-bookworm.conf diff --git a/meta-isar/conf/distro/raspios-bookworm-64.list b/meta-isar/conf/distro/raspios-bookworm-64.list new file mode 100644 index 00000000..bbdaa4c3 --- /dev/null +++ b/meta-isar/conf/distro/raspios-bookworm-64.list @@ -0,0 +1,9 @@ +deb http://deb.debian.org/debian bookworm main contrib non-free +deb-src http://deb.debian.org/debian bookworm main contrib non-free +deb http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free +deb-src http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free +deb http://deb.debian.org/debian bookworm-updates main contrib non-free +deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free + +deb http://archive.raspberrypi.org/debian/ bookworm main +deb-src http://archive.raspberrypi.org/debian/ bookworm main diff --git a/meta-isar/conf/distro/raspios-bookworm.conf b/meta-isar/conf/distro/raspios-bookworm.conf new file mode 100644 index 00000000..079dba24 --- /dev/null +++ b/meta-isar/conf/distro/raspios-bookworm.conf @@ -0,0 +1,27 @@ +# Raspberry Pi OS stable distribution configuration +# +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +BASE_DISTRO = "raspios" +BASE_DISTRO:arm64 = "raspios64" + +HOST_BASE_DISTRO ?= "debian" + +BASE_DISTRO_CODENAME = "bookworm" +HOST_DISTRO ?= "debian-bookworm" +HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" + +DISTRO_APT_SOURCES ?= "conf/distro/raspios-bookworm.list" +DISTRO_APT_SOURCES:arm64 ?= "conf/distro/raspios-bookworm-64.list" + +DISTRO_BOOTSTRAP_KEYS = "http://raspbian.raspberrypi.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" +DISTRO_BOOTSTRAP_KEYS:arm64 = "" + +DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8" + +THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key;sha256sum=76603890d82a492175caf17aba68dc73acb1189c9fd58ec0c19145dfa3866d56" + +COMPAT_DISTRO_ARCH:arm64 = "armhf" + +DISTRO_GCC = "12" diff --git a/meta-isar/conf/distro/raspios-bookworm.list b/meta-isar/conf/distro/raspios-bookworm.list new file mode 100644 index 00000000..ea3bc6e1 --- /dev/null +++ b/meta-isar/conf/distro/raspios-bookworm.list @@ -0,0 +1,5 @@ +deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi + +deb http://archive.raspberrypi.org/debian/ bookworm main +deb-src http://archive.raspberrypi.org/debian/ bookworm main diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 492bc123..fde00a71 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -45,9 +45,13 @@ BBMULTICONFIG = " \ virtualbox-bullseye \ virtualbox-bookworm \ rpi-arm-bullseye \ + rpi-arm-bookworm \ rpi-arm-v7-bullseye \ + rpi-arm-v7-bookworm \ rpi-arm-v7l-bullseye \ + rpi-arm-v7l-bookworm \ rpi-arm64-v8-bullseye \ + rpi-arm64-v8-bookworm \ sifive-fu540-sid \ starfive-visionfive2-sid \ qemuarm64-focal \ diff --git a/meta-isar/conf/multiconfig/rpi-arm-bookworm.conf b/meta-isar/conf/multiconfig/rpi-arm-bookworm.conf new file mode 100644 index 00000000..a3a7c8b3 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-bookworm.conf @@ -0,0 +1,5 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +MACHINE ?= "rpi-arm" +DISTRO ?= "raspios-bookworm" diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7-bookworm.conf b/meta-isar/conf/multiconfig/rpi-arm-v7-bookworm.conf new file mode 100644 index 00000000..f041d0b8 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-v7-bookworm.conf @@ -0,0 +1,5 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +MACHINE ?= "rpi-arm-v7" +DISTRO ?= "raspios-bookworm" diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7l-bookworm.conf b/meta-isar/conf/multiconfig/rpi-arm-v7l-bookworm.conf new file mode 100644 index 00000000..234029a0 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-v7l-bookworm.conf @@ -0,0 +1,5 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +MACHINE ?= "rpi-arm-v7l" +DISTRO ?= "raspios-bookworm" diff --git a/meta-isar/conf/multiconfig/rpi-arm64-v8-bookworm.conf b/meta-isar/conf/multiconfig/rpi-arm64-v8-bookworm.conf new file mode 100644 index 00000000..746de413 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm64-v8-bookworm.conf @@ -0,0 +1,5 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +MACHINE ?= "rpi-arm64-v8" +DISTRO ?= "raspios-bookworm" diff --git a/testsuite/citest.py b/testsuite/citest.py index 70213e87..607a0b20 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -219,6 +219,10 @@ class NoCrossTest(CIBaseTest): 'mc:rpi-arm-v7-bullseye:isar-image-base', 'mc:rpi-arm-v7l-bullseye:isar-image-base', 'mc:rpi-arm64-v8-bullseye:isar-image-base', + 'mc:rpi-arm-bookworm:isar-image-base', + 'mc:rpi-arm-v7-bookworm:isar-image-base', + 'mc:rpi-arm-v7l-bookworm:isar-image-base', + 'mc:rpi-arm64-v8-bookworm:isar-image-base', ] self.init() -- 2.39.2