From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7272620252316303360 X-Received: by 2002:a5d:5049:0:b0:319:6c90:5274 with SMTP id h9-20020a5d5049000000b003196c905274mr20902519wrt.30.1693288854677; Mon, 28 Aug 2023 23:00:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4b43:0:b0:313:f4ee:a4ce with SMTP id w3-20020a5d4b43000000b00313f4eea4cels327985wrs.1.-pod-prod-06-eu; Mon, 28 Aug 2023 23:00:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5YJmF+vrEiROGlRJ1kA8k5w1iBcdXXu0bH5iPTqdFdf3vQp7oMOf4D9nbEeTi/fWpgKMj X-Received: by 2002:a5d:4950:0:b0:317:df4f:4b97 with SMTP id r16-20020a5d4950000000b00317df4f4b97mr20524741wrs.7.1693288852651; Mon, 28 Aug 2023 23:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693288852; cv=none; d=google.com; s=arc-20160816; b=f2gsOCHZdmFmLQFjuncD3AozGfMmtmZXNAfcGy48DWK6/cie2px068z4jC2l52zgQ1 +bbicNNTXMom6fsbRcJILdzz6J/xOINN2MF2GxDBokRyjqIqXrQoJrvSTr9WeOkLCaBM aymbPhOc8/Kounux3aCGlcAjziaX1t6NDUcL7tw6h+LOcBXn3HIANT8SEEIF8IzX0D0Z Q5bGSLtLzZnDflZ5EUCwEceLehJ87uxCEm4WhxAaZWGPIzw05H8m105LfFIvhnDBIyzO T2J2vcydu/evBPNMndzdmMfg2PpB4j7OOKwBUDjJc+fxckVthVH344A2wPdRsALtStaa YTlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=h0k/pAXw24PwCkpaG8Ph3/X6Kp5a5W8xKz4EuIl4FfM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=m0esjXHfaXqHMroaCuXXNlOFTJnldcCGUemtsHkRfXRdB7Y/wY8crPnkknqAILPnv9 Yr0PL7EuIU60gnpA9GxM411iLyvjIz6svrtf8idn6H25xsM6gO/N9bx+VBTCt2LkdxRs 5906R7sk+flBCqF0hWVzV9uK0+V39Ik9DK0iJvgW5BIfi5e7ysdm5/JfltFCnGFUufOH 8ORfUuPXctClPz28jq8iaAVO3jK5DQYmNerj+QotDjIXU5ana310ZsEl7cZpQIkcB63W aqruAM3f4SDqbZqWH1enAT1PNG3siVXIeDUbV6A2POVN6y2gGhUl5FLvg8UkVfD9t9ry ubxQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bj23-20020a0560001e1700b0031aca87d8f3si793612wrb.0.2023.08.28.23.00.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Aug 2023 23:00:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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 37T60pVO010364 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 29 Aug 2023 08:00:51 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] meta-isar: Change BASE_DISTRO for 64-bit raspios Date: Tue, 29 Aug 2023 08:00:51 +0200 Message-Id: <20230829060051.3592-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: 2QkIwk7xvsar Unlike debian distributions, raspios for armhf and arm64 use different main repositories: - armhf: "http://raspbian.raspberrypi.org/raspbian" - binary packages are rebuilt to support older RPis (e.g. RPi1 / Rpi0); - arm64: "http://deb.debian.org/debian" - binary packages from the official debian repositories are used. Also, both "armhf" and "arm64" have a common repository that stores rpi-specific packages: "archive.raspberrypi.org/debian". This difference causes build issues with local rebuild. If raspios 64bit config has BASE_DISTRO:arm64 set to "debian", sumultaneous build for "rpi-arm64-v8" and "qemuarm64" causes conflicting packages populated to base-apt. Similar, setting BASE_DISTRO:arm64 to "raspios", causes conflicting packages in base-apt when "rpi-arm-v7" and "rpi-arm64-v8" are built sumultaneously. It means that base-apt location for raspios 64bit should differ both from raspios 32bit and debian. This patch adds mc:rpi-arm64-v8-bullseye:isar-image-base target to the repro test targets set for being able to reproduce the issue. At the same time, BASE_DISTRO for raspios 64-bit is renamed to "raspios64" to avoid conflicts with base-apt for debian target. Signed-off-by: Uladzimir Bely --- meta-isar/conf/distro/raspios-bullseye.conf | 2 +- testsuite/citest.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf index 2613969e..cc64a015 100644 --- a/meta-isar/conf/distro/raspios-bullseye.conf +++ b/meta-isar/conf/distro/raspios-bullseye.conf @@ -4,7 +4,7 @@ # Copyright (C) 2022 ilbers GmbH BASE_DISTRO = "raspios" -BASE_DISTRO:arm64 = "debian" +BASE_DISTRO:arm64 = "raspios64" HOST_BASE_DISTRO ?= "debian" diff --git a/testsuite/citest.py b/testsuite/citest.py index 90b8955f..48b10286 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -84,6 +84,7 @@ class ReproTest(CIBaseTest): def test_repro_signed(self): targets = [ 'mc:rpi-arm-v7-bullseye:isar-image-base', + 'mc:rpi-arm64-v8-bullseye:isar-image-base', 'mc:qemuarm64-bullseye:isar-image-base', ] -- 2.20.1