From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7272620252316303360 X-Received: by 2002:a2e:870d:0:b0:2bc:b9c7:7ba8 with SMTP id m13-20020a2e870d000000b002bcb9c77ba8mr1186861lji.43.1693975532486; Tue, 05 Sep 2023 21:45:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a316:0:b0:2b9:b171:d776 with SMTP id l22-20020a2ea316000000b002b9b171d776ls14500lje.2.-pod-prod-04-eu; Tue, 05 Sep 2023 21:45:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQ8zNmFuD1axZUSBDVVJmOzvUhDmOw5/68+n6U4THl1ZXZU0VtZkHu3O7WQiku0h4B7Jb6 X-Received: by 2002:a2e:80da:0:b0:2bc:e856:6208 with SMTP id r26-20020a2e80da000000b002bce8566208mr1156480ljg.33.1693975530230; Tue, 05 Sep 2023 21:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693975530; cv=none; d=google.com; s=arc-20160816; b=OQzExo7oubeTYBTTDfLQ9DnavdP+N3MDDj44hJ7h+sdbCkAkr2I54NQnhZOlRepd5a oUZDjyF4DBCasgUoVORqtoHuvxsDYeVXzSzrylI21qKW4BA8a+4doQMiT/WnkVQBvsIW tHD4ECAxytK6j3389QT1EOLlG/BeIafX7WpOgiXlymefzzZos6FwmgnvZqKj1pIjWrpm MBZJA6UNWtgqD5lb27Onwf3QZC8Py2Y9XTM8v2WuwfsEuxL6h+dWZab01W8a+6ygj6bp 4tN54I2t1vKwi1lYTqJV847WAuDthg7DIj0VZaDyqCPRbMwDlRnADBqWbrBwver7wl+9 /vzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=oNh1bIqHKy5zdETg2gKGMuTbFbBfLu6VdBNmBNCvCNw=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Jg+pIGrXQaCfed7WYRJm1UdY/oYQHni6J8I89OOFkA2WXMakni1JGUOySuOSPGTogF OypIudQ5z1NIe0Me3ddMMZBCsDwSpR1WkZHPUxrKPE+94vp3BhyXyolEhaRTVWVkwMTC qoF4ke/MnvvT3icFMyCrcuoBtTdVygfsQ+UHG/6CZ+Pw/aVAJujobT1AQQyu7EN7gUTC vMZbJKBs9MFg940kY8iH3tkLFE343Bac9e/Y3Pab0IspCLZhUUnnmAhCZR7KwFrUFVUH M5S5mnkgHXD2PjCbROXxwBMnxFCSV0zKchXBIxaIIXFDD40fuauqFqE19fhI+uDQYXit zuPQ== 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 bz13-20020a05651c0c8d00b002b6f8d5f93csi925164ljb.2.2023.09.05.21.45.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Sep 2023 21:45:30 -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 [127.0.0.1] (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 3864jRED013322 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 6 Sep 2023 06:45:28 +0200 Message-ID: <4f603dbb8735bce2138ccfb5bc40a290cba0238d.camel@ilbers.de> Subject: Re: [PATCH] meta-isar: Change BASE_DISTRO for 64-bit raspios From: Uladzimir Bely To: isar-users@googlegroups.com Date: Wed, 06 Sep 2023 07:45:31 +0300 In-Reply-To: <20230829060051.3592-1-ubely@ilbers.de> References: <20230829060051.3592-1-ubely@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (by Flathub.org) MIME-Version: 1.0 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: ZT75uRfPsVRZ On Tue, 2023-08-29 at 08:00 +0200, Uladzimir Bely wrote: > Unlike debian distributions, raspios for armhf and arm64 use > different > main repositories: >=20 > =C2=A0- armhf: "http://raspbian.raspberrypi.org/raspbian" - binary > packages > are rebuilt to support older RPis (e.g. RPi1 / Rpi0); > =C2=A0- arm64: "http://deb.debian.org/debian" - binary packages from the > official debian repositories are used. >=20 > Also, both "armhf" and "arm64" have a common repository that stores > rpi-specific packages: "archive.raspberrypi.org/debian". >=20 > 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. >=20 > Similar, setting BASE_DISTRO:arm64 to "raspios", causes conflicting > packages in base-apt when "rpi-arm-v7" and "rpi-arm64-v8" are built > sumultaneously. >=20 > It means that base-apt location for raspios 64bit should differ both > from raspios 32bit and debian. >=20 > 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. >=20 > Signed-off-by: Uladzimir Bely > --- > =C2=A0meta-isar/conf/distro/raspios-bullseye.conf | 2 +- > =C2=A0testsuite/citest.py=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 1 + > =C2=A02 files changed, 2 insertions(+), 1 deletion(-) >=20 > 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 @@ > =C2=A0# Copyright (C) 2022 ilbers GmbH > =C2=A0 > =C2=A0BASE_DISTRO =3D "raspios" > -BASE_DISTRO:arm64 =3D "debian" > +BASE_DISTRO:arm64 =3D "raspios64" > =C2=A0 > =C2=A0HOST_BASE_DISTRO ?=3D "debian" > =C2=A0 > 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): > =C2=A0=C2=A0=C2=A0=C2=A0 def test_repro_signed(self): > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 targets =3D [ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = 'mc:rpi-arm-v7-bullseye:isar-image-base', > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 'mc:r= pi-arm64-v8-bullseye:isar-image-base', > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = 'mc:qemuarm64-bullseye:isar-image-base', > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ] > =C2=A0 > --=20 > 2.20.1 >=20 Applied to next.