From patchwork Thu Jul 16 11:44:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 5250 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 16 Jul 2026 13:44:19 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f56.google.com (mail-ed1-f56.google.com [209.85.208.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66GBiID9030377 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Jul 2026 13:44:18 +0200 Received: by mail-ed1-f56.google.com with SMTP id 4fb4d7f45d1cf-69a1ab55774sf9191977a12.1 for ; Thu, 16 Jul 2026 04:44:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1784202253; cv=pass; d=google.com; s=arc-20260327; b=QWsKXS9Ebrq0QXgwNKdMCRwpxGm+xgnMOrkOfLmbgk/eK6Q71KUB0VxjikmZrjjuYr JijqIAKUKhvUejk/ETq/tZTU8vEEzztBmiIoqsdmJ/aA1Gpr/tnlnajKbJIeya6XUYJC 3dXZUfKPwSvOchesepvPcWf7IjDoByfgz5r/PDOVvfEPkmor+4HRAVh4P54G7v6fTvNa q6j2kGtSatD4gSMWgeqG1N91N/+4hkT/SOIyFNQzAZjPyJ/XejJ2VMxWLMkLGdZ1JkAV fZ361/DMgTA/gKHjrmv7AeOvYoJBT8i6HUTpBBY1KIMd9UFD4zTiuJZpiBqIEdGI0/6b GZgw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZUacRe51AEewq+Qkmp4AdsHWJTEdng3c2aZ2BfKdiKU=; fh=8+EF6LZfxNayJXFMwz1Cq9hEFNQ+/UpiCGnQBTh9mPw=; b=sNbhvPuHaoB0ODYIIADqkdbxUzpYFD7TJfX0lITw5ZSjww38jpaWqZ+MzQmUxQ8idE CQxVNto760fTeHsh9wYusqQkfu8fPg73UAFHZ8JMvodEijP57Y7FUA+fPX3wwbo4yAXF 6fGXN44Esc/49HdE1qhROpFhPVI0B3Uh8ZeqUqaThop7ni0qz/5QxcS/bJFg+QT7WIKg Nbge7RJ//Ixf5mdV23DoXPGFf5F81N2pILjkQ55tWNOxsok/VoEL9we2Cqnn7FZA5oEl RMKT3zVOiGs+nvEo+MfRbakk/71dFMv+z2cMZryaK4Vv/xUOZiUpuezcibiBAyA+jHEJ X5Yw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Bup6YW23; spf=pass (google.com: domain of fm-1324425-2026071611440969c6b3819600020797-_imccn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2026071611440969c6b3819600020797-_imCcN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1784202253; x=1784807053; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=ZUacRe51AEewq+Qkmp4AdsHWJTEdng3c2aZ2BfKdiKU=; b=Cihr15LtdTbedyFu6whp6LhNTXzo2qAEHvegYhNkthnC7znE/B0A9NYq91fWECa5hA XVu96Q2Xmy/9j8J8dZ70g4NEGt5cV2NUJsmpK//EWZBzVLeNurbRdEeNTBgX3gwTzf4H +PHn0yLFjd5ZJQCF19kEt7Mg3wvasUOtF98CZ5MH9tI7b5yu0a5trcy8tZrc57H3JtKN FKU9cO47JoUW2S/ASp1e0bwcaaoJ6AomdJcMRJKJiHP2vkN81RP4Or4wHfB8H+yi8hxz Y54AcAD17QsVkK7Y2O2b7IzITl++0dd8/NUqFaK/XlmPCWrXr/6QwEN5Vout+2E1dvk0 avIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784202253; x=1784807053; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:reply-to:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to:content-type; bh=ZUacRe51AEewq+Qkmp4AdsHWJTEdng3c2aZ2BfKdiKU=; b=hqGWreYNLHyzBKAefMsdrg3FxHN/fuxYo+1BerSaHMe/vpam7D4rUmAPOWSfr4145S OgEoKfkLB/Wgn3Cnyyq6KZY32ZBNWnUXKhXXkfxlBECimLdELQd+QnMuTNntQ6sMW4hK BnGHESX9TPE3djvdDoYsuznJvYKlbqyO3kwJHI/23xAnZ8aFgekjrPop94rDywJmZoCr Dfmk22LpJKOChkvdtqnk5P1if9YEjXx8Fj/D/5aQHc9MGvvzvkbDNukhj0BML6N9El04 U0VOj/rnMfSydPyeU2Cj0XYUURtjqdx9UgAh77hHI1xKFb8K2JjZEQz3IKKJuRGe6lZc M9Ow== X-Forwarded-Encrypted: i=2; AHgh+Rr8SCgazYVirK5Tt2SLmhrg/GIqEUeXfsFpKUvqXQBPoXnL4JXA7aUgyIg+poCtDiNNae46kIY=@isar-build.org X-Gm-Message-State: AOJu0YxjEh16VrCnzMK2pQDIlMpEDp8+zJYJS+3Soq2bBoNga9zx16xw 55UeyGMOSjr779rUh8y4zoieqsCLZLC6yxWAYPmluauPT/IonE7nbEQB X-Received: by 2002:a05:6402:e08:b0:69a:a81d:d454 with SMTP id 4fb4d7f45d1cf-69e1966b38amr3438312a12.7.1784202252551; Thu, 16 Jul 2026 04:44:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPSZB+IkhGkw7HmkEumlc/kRZDim2b/Qdi+lE4MBsbasOg==" Received: by 2002:aa7:d28c:0:b0:697:f540:23f8 with SMTP id 4fb4d7f45d1cf-69e4cc91151ls596854a12.2.-pod-prod-06-eu; Thu, 16 Jul 2026 04:44:09 -0700 (PDT) X-Received: by 2002:a05:6402:1f0f:b0:69a:a94c:424a with SMTP id 4fb4d7f45d1cf-69e199dfa48mr4031157a12.33.1784202249592; Thu, 16 Jul 2026 04:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1784202249; cv=none; d=google.com; s=arc-20260327; b=YAC0xMDYzWyqliDVK6UxrXTQrl1Z/wHn7v1T6fi6cDBcIl4L/jQgnQOIrfnEz8J8Za 8LVKsoVcJi4ljmt6EXKusE6Qdj0iW3XtLYNnzVOCvRxC2navEBXiXi92Hm/p3RJMZJRl p5N1/4AfSNmRpU35JsLYlyWepX+sCxK0CVrcwsHHEbW/0RfoiYbL6EOp4HPlaInQDVV7 Bx04n261C1Akw6Rrz8D5rjf+7dM8yPJbCE++uGvWWmw1o7cHH7jMfpCiIuzQuwUtmJbh pyscxzYlb6C5KDF/Oc13MBrqOCJAxTKZXFwY4NRV9N45T3vzwuSZTIgwVd9CnD0czxze 2ypQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=sC1q1zQgwOj3vaqtEx4d3GGHh6KZS8WS+VwuET2x6yM=; fh=kAHvV5cWHMByN5crjWvgp+/pwc4jKTq6gGh8ffDReWA=; b=CcMk+k0vjH1GryJmb3iZk+1haC8rHhTXRowJaHrrUvUJv0Y6SY5+p0eOnkRaBGSV2d 3SiMTXqIcgdJdovJijQQyf4SEZQEEVyuPIA4JEJnLOi6CqzJ0OZrJUAiJZNkFZlPlEkV GobZOi7lyRibOUqRa8ER6Xt36KGrp8vnxQR40X+6hbt9bnXWEKH2CruzfG1zUd0BxabB n+LL1IPmnyaWTQstGK/vi/m2JXzRRJ1iSy2OMjiDIl5DQNKlpLgq+6HylHuEx/jwCO+7 KC7+W/OUQYxfeKWaKRxmkAPRgL6VDkR0F2dBAtjAhBKE8xDfJ4kmPXG4YZJOgALo9GpN nUSg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Bup6YW23; spf=pass (google.com: domain of fm-1324425-2026071611440969c6b3819600020797-_imccn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2026071611440969c6b3819600020797-_imCcN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-69cd29434f1si196126a12.3.2026.07.16.04.44.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2026 04:44:09 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-2026071611440969c6b3819600020797-_imccn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2026071611440969c6b3819600020797 for ; Thu, 16 Jul 2026 13:44:09 +0200 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: amikan@ilbers.de, Srinuvasan A Subject: [PATCH v2] Add trixie support for raspberry pi targets Date: Thu, 16 Jul 2026 17:14:11 +0530 Message-Id: <20260716114411.267837-1-srinuvasan.a@siemens.com> In-Reply-To: <1d84e44b-b69e-4132-849f-07f4516b997f@ilbers.de> References: <1d84e44b-b69e-4132-849f-07f4516b997f@ilbers.de> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Bup6YW23; spf=pass (google.com: domain of fm-1324425-2026071611440969c6b3819600020797-_imccn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2026071611440969c6b3819600020797-_imCcN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Srinuvasan A Add trixie support for the following Raspberry Pi machines: - rpi-arm - rpi-arm-v7 - rpi-arm-v7l - rpi-arm64-v8 Also include the new targets in the relevant test suites. Signed-off-by: Srinuvasan A --- kas/distro/Kconfig | 5 +++ kas/distro/raspios-trixie.yaml | 7 ++++ kas/machine/Kconfig | 4 +++ meta-isar/conf/distro/raspios-trixie-64.list | 9 +++++ meta-isar/conf/distro/raspios-trixie.conf | 35 +++++++++++++++++++ meta-isar/conf/distro/raspios-trixie.list | 5 +++ meta-isar/conf/machine/rpi-arm-v7.conf | 5 ++- meta-isar/conf/machine/rpi-arm-v7l.conf | 5 ++- meta-isar/conf/machine/rpi-arm.conf | 5 ++- meta-isar/conf/machine/rpi-arm64-v8.conf | 5 ++- meta-isar/conf/machine/rpi-common.conf | 18 ++++++++-- meta-isar/conf/mc.conf | 4 +++ .../conf/multiconfig/rpi-arm-trixie.conf | 8 +++++ .../conf/multiconfig/rpi-arm-v7-trixie.conf | 8 +++++ .../conf/multiconfig/rpi-arm-v7l-trixie.conf | 8 +++++ .../conf/multiconfig/rpi-arm64-v8-trixie.conf | 8 +++++ testsuite/citest.py | 4 +++ testsuite/data/targets.yml | 8 +++++ 18 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 kas/distro/raspios-trixie.yaml create mode 100644 meta-isar/conf/distro/raspios-trixie-64.list create mode 100644 meta-isar/conf/distro/raspios-trixie.conf create mode 100644 meta-isar/conf/distro/raspios-trixie.list create mode 100644 meta-isar/conf/multiconfig/rpi-arm-trixie.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf create mode 100644 meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf diff --git a/kas/distro/Kconfig b/kas/distro/Kconfig index 9dadc52e..731be6ca 100644 --- a/kas/distro/Kconfig +++ b/kas/distro/Kconfig @@ -83,6 +83,10 @@ config RASPIOS_BOOKWORM bool "Raspberry Pi OS Debian 12 (bookworm)" depends on (DISTRO_RASPIOS && CODENAME_BOOKWORM) || ANY_MACHINE_DISTRO +config RASPIOS_TRIXIE + bool "Raspberry Pi OS Debian 13 (trixie)" + depends on (DISTRO_RASPIOS && CODENAME_TRIXIE) || ANY_MACHINE_DISTRO + config UBUNTU_FOCAL bool "Ubuntu 20.04 (Focal)" depends on (DISTRO_UBUNTU && CODENAME_FOCAL) || ANY_MACHINE_DISTRO @@ -118,6 +122,7 @@ config KAS_INCLUDE_DISTRO default "kas/distro/debian-sid.yaml" if DEBIAN_SID default "kas/distro/raspios-bullseye.yaml" if RASPIOS_BULLSEYE default "kas/distro/raspios-bookworm.yaml" if RASPIOS_BOOKWORM + default "kas/distro/raspios-trixie.yaml" if RASPIOS_TRIXIE default "kas/distro/ubuntu-focal.yaml" if UBUNTU_FOCAL default "kas/distro/ubuntu-jammy.yaml" if UBUNTU_JAMMY default "kas/distro/ubuntu-noble.yaml" if UBUNTU_NOBLE diff --git a/kas/distro/raspios-trixie.yaml b/kas/distro/raspios-trixie.yaml new file mode 100644 index 00000000..6a77b435 --- /dev/null +++ b/kas/distro/raspios-trixie.yaml @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH + +header: + version: 14 + +distro: raspios-trixie diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 04881a4b..7d01ca92 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -178,6 +178,7 @@ config MACHINE_RPI_ARM_V7 select DISTRO_RASPIOS select CODENAME_BULLSEYE select CODENAME_BOOKWORM + select CODENAME_TRIXIE select ARCH_ARMHF config MACHINE_RPI_ARM_V7L @@ -185,6 +186,7 @@ config MACHINE_RPI_ARM_V7L select DISTRO_RASPIOS select CODENAME_BULLSEYE select CODENAME_BOOKWORM + select CODENAME_TRIXIE select ARCH_ARMHF config MACHINE_RPI_ARM @@ -192,6 +194,7 @@ config MACHINE_RPI_ARM select DISTRO_RASPIOS select CODENAME_BULLSEYE select CODENAME_BOOKWORM + select CODENAME_TRIXIE select ARCH_ARMHF config MACHINE_RPI_ARM64_V8 @@ -199,6 +202,7 @@ config MACHINE_RPI_ARM64_V8 select DISTRO_RASPIOS select CODENAME_BULLSEYE select CODENAME_BOOKWORM + select CODENAME_TRIXIE select ARCH_ARM64 config MACHINE_RPI_ARM64_V8_EFI diff --git a/meta-isar/conf/distro/raspios-trixie-64.list b/meta-isar/conf/distro/raspios-trixie-64.list new file mode 100644 index 00000000..fe981870 --- /dev/null +++ b/meta-isar/conf/distro/raspios-trixie-64.list @@ -0,0 +1,9 @@ +deb http://deb.debian.org/debian trixie main contrib non-free +deb-src http://deb.debian.org/debian trixie main contrib non-free +deb http://deb.debian.org/debian-security trixie-security/updates main contrib non-free +deb-src http://deb.debian.org/debian-security trixie-security/updates main contrib non-free +deb http://deb.debian.org/debian trixie-updates main contrib non-free +deb-src http://deb.debian.org/debian trixie-updates main contrib non-free + +deb http://archive.raspberrypi.org/debian trixie main +deb-src http://archive.raspberrypi.org/debian trixie main diff --git a/meta-isar/conf/distro/raspios-trixie.conf b/meta-isar/conf/distro/raspios-trixie.conf new file mode 100644 index 00000000..06deab85 --- /dev/null +++ b/meta-isar/conf/distro/raspios-trixie.conf @@ -0,0 +1,35 @@ +# Raspberry Pi OS stable distribution configuration +# +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH + +BASE_DISTRO = "raspios" +BASE_DISTRO:arm64 = "raspios64" + +HOST_BASE_DISTRO ?= "debian" + +BASE_DISTRO_CODENAME = "trixie" +HOST_DISTRO ?= "debian-trixie" +HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" + +DISTRO_APT_SOURCES ?= "conf/distro/raspios-trixie.list" +DISTRO_APT_SOURCES:arm64 ?= "conf/distro/raspios-trixie-64.list" +# workaround for https://wiki.debian.org/Teams/Apt/Sha1Removal +DISTRO_MM_OPTS += "${MMAPTOPT_NOEXPKEYSIGN}" + +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 = "14" + +DEBIAN_COMPAT = "13" + +DEBIAN_STANDARDS_VERSION ?= "4.7.2" + +IMAGE_PREINSTALL:append = " systemd-sysv" diff --git a/meta-isar/conf/distro/raspios-trixie.list b/meta-isar/conf/distro/raspios-trixie.list new file mode 100644 index 00000000..20e1e945 --- /dev/null +++ b/meta-isar/conf/distro/raspios-trixie.list @@ -0,0 +1,5 @@ +deb http://raspbian.raspberrypi.org/raspbian trixie main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian trixie main contrib non-free rpi + +deb http://archive.raspberrypi.org/debian trixie main +deb-src http://archive.raspberrypi.org/debian trixie main diff --git a/meta-isar/conf/machine/rpi-arm-v7.conf b/meta-isar/conf/machine/rpi-arm-v7.conf index f71d15f1..cdeacafd 100644 --- a/meta-isar/conf/machine/rpi-arm-v7.conf +++ b/meta-isar/conf/machine/rpi-arm-v7.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2022 ilbers GmbH +# Copyright (C) 2022,2026 ilbers GmbH DISTRO_ARCH ?= "armhf" KERNEL_NAME = "kernel7" include conf/machine/rpi-common.conf + +KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v7" +KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v7" diff --git a/meta-isar/conf/machine/rpi-arm-v7l.conf b/meta-isar/conf/machine/rpi-arm-v7l.conf index 7c20baae..d455a69d 100644 --- a/meta-isar/conf/machine/rpi-arm-v7l.conf +++ b/meta-isar/conf/machine/rpi-arm-v7l.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2022 ilbers GmbH +# Copyright (C) 2022,2026 ilbers GmbH DISTRO_ARCH ?= "armhf" KERNEL_NAME = "kernel7l" include conf/machine/rpi-common.conf + +KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v7" +KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v7" diff --git a/meta-isar/conf/machine/rpi-arm.conf b/meta-isar/conf/machine/rpi-arm.conf index 98bb3880..f0ff72de 100644 --- a/meta-isar/conf/machine/rpi-arm.conf +++ b/meta-isar/conf/machine/rpi-arm.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2022 ilbers GmbH +# Copyright (C) 2022,2026 ilbers GmbH DISTRO_ARCH ?= "armhf" KERNEL_NAME = "kernel" include conf/machine/rpi-common.conf + +KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v6" +KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v6" diff --git a/meta-isar/conf/machine/rpi-arm64-v8.conf b/meta-isar/conf/machine/rpi-arm64-v8.conf index 89a5b999..a1fdec89 100644 --- a/meta-isar/conf/machine/rpi-arm64-v8.conf +++ b/meta-isar/conf/machine/rpi-arm64-v8.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2022 ilbers GmbH +# Copyright (C) 2022,2026 ilbers GmbH DISTRO_ARCH ?= "arm64" KERNEL_NAME = "kernel8" include conf/machine/rpi-common.conf + +KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v8" +KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v8" diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf index 9dd70f99..46e37657 100644 --- a/meta-isar/conf/machine/rpi-common.conf +++ b/meta-isar/conf/machine/rpi-common.conf @@ -16,20 +16,32 @@ KERNEL_TYPE = "raspios" KERNEL_IMAGE_PKG ?= "raspberrypi-kernel" KERNEL_HEADERS_PKG ?= "raspberrypi-kernel-headers" -IMAGE_PREINSTALL += "raspberrypi-bootloader \ - raspberrypi-sys-mods \ +IMAGE_PREINSTALL += "raspberrypi-sys-mods \ raspi-config \ systemd-sysv \ udev" +IMAGE_PREINSTALL:bullseye += "raspberrypi-bootloader" +IMAGE_PREINSTALL:bookworm += "raspberrypi-bootloader" +IMAGE_PREINSTALL:trixie += "raspi-firmware" + IMAGE_INSTALL += "bootconfig-${MACHINE}" IMAGER_INSTALL:wic += "parted \ dosfstools \ mtools \ e2fsprogs \ - python3-distutils \ bmap-tools" +IMAGER_INSTALL:bullseye:wic += "python3-distutils" +IMAGER_INSTALL:bookworm:wic += "python3-distutils" +IMAGER_INSTALL:trixie:wic += "python3-setuptools" + IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/" + +IMAGE_BOOT_FILES:trixie ?= "${IMAGE_ROOTFS}/boot/cmdline.txt;./ \ + ${IMAGE_ROOTFS}/boot/config.txt;./ \ + ${IMAGE_ROOTFS}/boot/firmware/*.*;./ \ + ${IMAGE_ROOTFS}/boot/firmware/overlays/*;overlays/" + diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 72ebceaf..9d2cd652 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -62,12 +62,16 @@ BBMULTICONFIG = " \ x86-pc-bookworm \ rpi-arm-bullseye \ rpi-arm-bookworm \ + rpi-arm-trixie \ rpi-arm-v7-bullseye \ rpi-arm-v7-bookworm \ + rpi-arm-v7-trixie \ rpi-arm-v7l-bullseye \ rpi-arm-v7l-bookworm \ + rpi-arm-v7l-trixie \ rpi-arm64-v8-bullseye \ rpi-arm64-v8-bookworm \ + rpi-arm64-v8-trixie \ rpi-arm64-v8-efi-bookworm \ sifive-fu540-trixie \ starfive-visionfive2-trixie \ diff --git a/meta-isar/conf/multiconfig/rpi-arm-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-trixie.conf new file mode 100644 index 00000000..7574ee83 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-trixie.conf @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2022,2026 ilbers GmbH + +MACHINE ?= "rpi-arm" +DISTRO ?= "raspios-trixie" + +KERNEL_IMAGE_PKG = "linux-image-rpi-v6" +KERNEL_HEADERS_PKG = "linux-headers-rpi-v6" diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf new file mode 100644 index 00000000..b911ed71 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2022,2026 ilbers GmbH + +MACHINE ?= "rpi-arm-v7" +DISTRO ?= "raspios-trixie" + +KERNEL_IMAGE_PKG = "linux-image-rpi-v7" +KERNEL_HEADERS_PKG = "linux-headers-rpi-v7" diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf new file mode 100644 index 00000000..f6679d74 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2022,2026 ilbers GmbH + +MACHINE ?= "rpi-arm-v7l" +DISTRO ?= "raspios-trixie" + +KERNEL_IMAGE_PKG = "linux-image-rpi-v7" +KERNEL_HEADERS_PKG = "linux-headers-rpi-v7" diff --git a/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf new file mode 100644 index 00000000..deb05d98 --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2022,2026 ilbers GmbH + +MACHINE ?= "rpi-arm64-v8" +DISTRO ?= "raspios-trixie" + +KERNEL_IMAGE_PKG = "linux-image-rpi-v8" +KERNEL_HEADERS_PKG = "linux-headers-rpi-v8" diff --git a/testsuite/citest.py b/testsuite/citest.py index 1facc8c2..6731b359 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -1191,9 +1191,13 @@ class NoCrossTest(CIBaseTest): def test_nocross_rpi(self): targets = [ 'mc:rpi-arm-bullseye:isar-image-base', + 'mc:rpi-arm-trixie:isar-image-base', 'mc:rpi-arm-v7-bullseye:isar-image-base', + 'mc:rpi-arm-v7-trixie:isar-image-base', 'mc:rpi-arm-v7l-bullseye:isar-image-base', + 'mc:rpi-arm-v7l-trixie:isar-image-base', 'mc:rpi-arm64-v8-bullseye:isar-image-base', + 'mc:rpi-arm64-v8-trixie:isar-image-base', ] self.init() diff --git a/testsuite/data/targets.yml b/testsuite/data/targets.yml index 64380620..2e5fa120 100644 --- a/testsuite/data/targets.yml +++ b/testsuite/data/targets.yml @@ -107,18 +107,26 @@ a: !mux name: rpi-arm-bullseye rpi-arm-bookworm: name: rpi-arm-bookworm + rpi-arm-trixie: + name: rpi-arm-trixie rpi-arm-v7-bullseye: name: rpi-arm-v7-bullseye rpi-arm-v7-bookworm: name: rpi-arm-v7-bookworm + rpi-arm-v7-trixie: + name: rpi-arm-v7-trixie rpi-arm-v7l-bullseye: name: rpi-arm-v7l-bullseye rpi-arm-v7l-bookworm: name: rpi-arm-v7l-bookworm + rpi-arm-v7l-trixie: + name: rpi-arm-v7l-trixie rpi-arm64-v8-bullseye: name: rpi-arm64-v8-bullseye rpi-arm64-v8-bookworm: name: rpi-arm64-v8-bookworm + rpi-arm64-v8-trixie: + name: rpi-arm64-v8-trixie rpi-arm64-v8-efi-bookworm: name: rpi-arm64-v8-efi-bookworm sifive-fu540-trixie: