From patchwork Thu Jul 16 06:55:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 5248 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 08:55:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f59.google.com (mail-ed1-f59.google.com [209.85.208.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66G6tjE2028784 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Jul 2026 08:55:46 +0200 Received: by mail-ed1-f59.google.com with SMTP id 4fb4d7f45d1cf-698557ec1e9sf2706358a12.1 for ; Wed, 15 Jul 2026 23:55:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1784184940; cv=pass; d=google.com; s=arc-20260327; b=LPJlOpPUcjqn6v7AkU57ZJ69zevp5Cnj15bvxdWt1h8Nr/8W83qQbeoPTVpnVnQmza iKL6Ug4XaTLcfq6aBUx6tiraEhf1uL/lR2sGE+iNMvSjjEUCwZcVNGRsqE42MIzTzHFT 6+m2vGo6+nr/MqhXmEorAahaTgqJu9ZR7eDpGiywopYSF03FFflswxC/orD581gU4UO+ VXioT8ot+9Q4ccTyAxZawBLeveN8XEoSlUzkEUaN1IAd0SLYrpKWwR2tnkddPOxlp7rD C/6R4ijjhJDcYyFS1SPX9ETBVIC14SjXFt3Ys46djCvb6EpHvuMK0jRaKGDhQDxH8l9P 99LA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=vQcEIkUywI2X3lmVZRXK6ork8yMS77B774j426b3SU0=; fh=+sTN2Y5u4F4nVFB93P24WZLgQo/yIiIhnvf0E0Tl6Yo=; b=YTzFYOIEbQPTy3mRJQa8dgHyXNuhjab2urSwStpdmrDRYozLa36zAci+mO7DIJKc2m GOaNAXZAd+/66SdCSKuKaC6eT/qmOzJIzqEyqOptz+LAA+nRQXuz4LnzK86xWNRb6sbQ U4rMR4RN/UkyOwa/VqCdpina7pZhN9ZrsFk4AYza1DJo1G6REjCP0HJ80Y9b6NvLV8NN aG6viwIaHQ4NT4z5Q76M8ND5+8YFwLl0qznmB7NY+ubzbzvv+fWPPcKavSTI7Ae7WXaa 0tH2PGLVC3QNH/usxoFGXBUteDqbUmJSyKX7yBVd7P8EawzqNCd8WLBPu0QWgC+jKF9C 7U3g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bo3IM7Ti; spf=pass (google.com: domain of fm-1324425-20260716065537dfb636cf6100020726-n6gxtq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-20260716065537dfb636cf6100020726-N6GXtq@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=1784184940; x=1784789740; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=vQcEIkUywI2X3lmVZRXK6ork8yMS77B774j426b3SU0=; b=yDbWPr5Rc2s2dhWsuLrZ/k/K19tTdFAqAL4Mq/imzntK/2mCZf/URFvhrRbZ3Bingf D+7sRnFTFM0sUue8030IJMwWOvq8Dfufb6F0Wzmw48796UOjP8nlSn59MDDfg6moAsir pQo4t1yHCnFDexKBEL7XVAVrIO+Hkl+5Fv31ex/pxn3f1I4LOmw43QxcvAIsVizR4pqy woqLTgvMwJZQLN1+bmudusUOa+MMLVnMVWlAG0AOsiK7hFwOOqm5yFMn3RaL/tSrrCVy dZ5TTaxLKEFwKbEZXk3rapQVEo5SRBhCPM/6L1bJlwWyFeDwz2VoazgdipB5SUqkk8/O SGCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784184940; x=1784789740; 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: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=vQcEIkUywI2X3lmVZRXK6ork8yMS77B774j426b3SU0=; b=bELsQm82ywbcsqOROz+Cs0svjOKP2JZMOhxEPFBVAfpiCJfIHUnMKng+VgpahNpDVD h7qqgRcrImo0qJNSZRI75NRnRw8wge4ObFzT/5oDTx0iIYmuYYIdDf+Y3cYFoigb3D8p zm2wqeRaZ4EChFz9MRc6uGSOpkgMoU61UkrBId9BHHag7wB6veF9ltEz4f53WyN+VyBs UVj0lxpwxTzp6JkoQ3fsmbxrVg8oTqBh8NW1764fJLtEXmpCyiFhNYPbYMBwhxlsA8I4 566QkPCu5CChHKA+gq1YwQ6eDSwoAVx7Gd2sNVVusco+eET//mQAYEE4AvvzMforenQb HQ1g== X-Forwarded-Encrypted: i=2; AHgh+RqFaivJzO49GMSQDXkai6uMP/aTFqp4js6SbmVh+ogl9BtbJDMDgKiACtvzc8bRw1Au3PZy4Fc=@isar-build.org X-Gm-Message-State: AOJu0YyXPun9aKSk8I4EYLEQCdQg7/iv6wxTSQGkeFZKkS26WnpXWX7C Cx6c7oYKhNtj7LFg2o0ow6AMf8nZUk9IGOqHchI1tecV1HLKdAKm1Eao X-Received: by 2002:a05:6402:358b:b0:697:c052:a990 with SMTP id 4fb4d7f45d1cf-69c5f121966mr9612879a12.19.1784184940209; Wed, 15 Jul 2026 23:55:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPTseeVegSJsfPW0ak3sLZqaNacqgvmYbTPb0fIqXnNFcQ==" Received: by 2002:a05:6402:a0c9:b0:699:2448:be6a with SMTP id 4fb4d7f45d1cf-69e4cc4dcd8ls176366a12.1.-pod-prod-09-eu; Wed, 15 Jul 2026 23:55:38 -0700 (PDT) X-Received: by 2002:a05:6402:40cd:b0:698:81ab:c506 with SMTP id 4fb4d7f45d1cf-69c5f36cd17mr9610044a12.39.1784184937851; Wed, 15 Jul 2026 23:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1784184937; cv=none; d=google.com; s=arc-20260327; b=jV9VyWY6LiywJVVjDy7SCKAuQtjKq9JV7x08DWvwMkL3rSav+tfq4Xnsol4DWym2Ro pk900Aryf7xukYWBevqIZ+AttKdWKBS4glqyvKGPF1KNyvTCEHrj9P2WHSiVjZhQHB+5 S84WvRgrgviVcQu2rvp3xDSGNJHcjOxe4dEBhE3HK90WBZkYgTF9he3nKEHGlucabyDD DZ8TVDb9KuslDCjclqqzVcvpUhJkiG2BrF6+2Umcu0WKDFY8VllTMqceIzEa3Z7Ddt20 Prdft3hdGs6mzibYXWPksWwk89LPKIxcuvx5NUhwk7I61ZX//21AH+oLqJYCju08TIYE j4cg== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=enGXZVcEvCJrQJcUl/j3pYW7NATSh7JBSP5F3cBvR+s=; fh=q34A+PDu/veyKhQmJ8Sf9YPiZusI+h3MND2WD1Gk9tg=; b=K+cwLtOCNzanX2Uw/KtwyTfeoR7mww9Q78HCJPssMiTbkB1MJ2PxegvRRsQvjUnEjV j6JyfQ1t390SWoBBqzjY4azAm5fIsTc/tmrTYYTadJzDl1RPtrQQ3rtcoktyNH7eSzHL dpRlb6iUkSqWnwgT4MLSuwKd2A1vw1TOq1zO1+ShFeJ4R30pgw7aQ/QEVajCDMnkFSIL u0j6f79cBXUVMK48a8TRzP2WKKqYFRZwwWJxYnTweUYrTyl5QnRQ7/z/tDhWlE5qYHAK J3J8GBmOr2pWkFPFE+F7dLV9o5NC9sXAyq2zHoCjYMxsK/db6pnsCF5NWMETbWU9YWQN ZeLA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bo3IM7Ti; spf=pass (google.com: domain of fm-1324425-20260716065537dfb636cf6100020726-n6gxtq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-20260716065537dfb636cf6100020726-N6GXtq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-69cd29a8eb5si137754a12.8.2026.07.15.23.55.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2026 23:55:37 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-20260716065537dfb636cf6100020726-n6gxtq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20260716065537dfb636cf6100020726 for ; Thu, 16 Jul 2026 08:55:37 +0200 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: Srinuvasan A Subject: [PATCH] Add trixie support for raspberry pi targets Date: Thu, 16 Jul 2026 12:25:41 +0530 Message-Id: <20260716065541.265992-1-srinuvasan.a@siemens.com> 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=bo3IM7Ti; spf=pass (google.com: domain of fm-1324425-20260716065537dfb636cf6100020726-n6gxtq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-20260716065537dfb636cf6100020726-N6GXtq@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 | 33 +++++++++++++++++++ meta-isar/conf/distro/raspios-trixie.list | 5 +++ meta-isar/conf/machine/rpi-arm-v7.conf | 3 ++ meta-isar/conf/machine/rpi-arm-v7l.conf | 3 ++ 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 +++ 17 files changed, 132 insertions(+), 5 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..fbf8a82f 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..15ff700e --- /dev/null +++ b/meta-isar/conf/distro/raspios-trixie.conf @@ -0,0 +1,33 @@ +# 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_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..ae512c38 100644 --- a/meta-isar/conf/machine/rpi-arm-v7.conf +++ b/meta-isar/conf/machine/rpi-arm-v7.conf @@ -5,3 +5,6 @@ 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..7633a00a 100644 --- a/meta-isar/conf/machine/rpi-arm-v7l.conf +++ b/meta-isar/conf/machine/rpi-arm-v7l.conf @@ -5,3 +5,6 @@ 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..58e363c0 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) 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..6fd54872 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) 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..ca744eac --- /dev/null +++ b/meta-isar/conf/multiconfig/rpi-arm-trixie.conf @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 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..e10b4237 --- /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) 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..6c9f0131 --- /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) 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..77a4c31e --- /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) 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..0b6f0b4d 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -180,7 +180,9 @@ class ReproTest(CIBaseTest): def test_repro_signed(self): targets = [ 'mc:rpi-arm-v7-bookworm:isar-image-base', + 'mc:rpi-arm-v7-trixie:isar-image-base', 'mc:rpi-arm64-v8-bookworm:isar-image-base', + 'mc:rpi-arm64-v8-trixie:isar-image-base', 'mc:qemuarm64-bookworm:isar-image-base', ] @@ -1202,7 +1204,9 @@ class NoCrossTest(CIBaseTest): def test_nocross_rpi_debsrc(self): targets = [ 'mc:rpi-arm-bookworm:isar-image-base', + 'mc:rpi-arm-trixie:isar-image-base', 'mc:rpi-arm-v7l-bookworm:isar-image-base', + 'mc:rpi-arm-v7l-trixie:isar-image-base', ] self.init()