From: Ilia Skochilov <iskochilov@ilbers.de>
To: isar-users@googlegroups.com
Cc: Ilia Skochilov <iskochilov@ilbers.de>
Subject: [PATCH v2 4/4] Add bookworm support for RPI
Date: Tue, 13 Feb 2024 10:06:59 +0000 [thread overview]
Message-ID: <20240213100659.3770402-5-iskochilov@ilbers.de> (raw)
In-Reply-To: <20240213100659.3770402-1-iskochilov@ilbers.de>
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 <iskochilov@ilbers.de>
---
.../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
next prev parent reply other threads:[~2024-02-13 10:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 10:06 [PATCH v2 0/4] Add bookworm support for machines Ilia Skochilov
2024-02-13 10:06 ` [PATCH v2 1/4] Add bookworm support for de0-nano-soc Ilia Skochilov
2024-02-13 10:06 ` [PATCH v2 2/4] Add bookworm support for bananapi Ilia Skochilov
2024-02-13 10:06 ` [PATCH v2 3/4] Add bookworm support for virtualbox Ilia Skochilov
2024-02-13 10:06 ` Ilia Skochilov [this message]
2024-02-15 13:04 ` [PATCH v2 0/4] Add bookworm support for machines Anton Mikanovich
2024-02-20 8:50 ` 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=20240213100659.3770402-5-iskochilov@ilbers.de \
--to=iskochilov@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