From: Uladzimir Bely <ubely@ilbers.de>
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 [thread overview]
Message-ID: <20230829060051.3592-1-ubely@ilbers.de> (raw)
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 <ubely@ilbers.de>
---
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
next reply other threads:[~2023-08-29 6:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 6:00 Uladzimir Bely [this message]
2023-09-06 4:45 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829060051.3592-1-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox