rpi: Fix override syntax in raspberry pi targets

Message ID	20261110142953.2397231-1-wzh@ilbers.de
State	New
Headers	show Return-Path: <isar-users+bncBD7ZZZNM2YPRB46VZTLQMGQE5AT633Y@googlegroups.com> Sender: isar-users@googlegroups.com Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; From: Zhihang Wei <wzh@ilbers.de> To: isar-users@googlegroups.com Subject: [PATCH] rpi: Fix override syntax in raspberry pi targets Date: Tue, 10 Nov 2026 15:29:53 +0100 Message-Id: <20261110142953.2397231-1-wzh@ilbers.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com
Series	rpi: Fix override syntax in raspberry pi targets \| expand rpi: Fix override syntax in raspberry pi targets

Message ID

20261110142953.2397231-1-wzh@ilbers.de

State

New

Headers

Sender: isar-users@googlegroups.com
Received-SPF: pass (google.com: domain of wzh@ilbers.de designates
 85.214.156.166 as permitted sender) client-ip=85.214.156.166;
From: Zhihang Wei <wzh@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH] rpi: Fix override syntax in raspberry pi targets
Date: Tue, 10 Nov 2026 15:29:53 +0100
Message-Id: <20261110142953.2397231-1-wzh@ilbers.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list isar-users@googlegroups.com;
 contact isar-users+owners@googlegroups.com

Series

rpi: Fix override syntax in raspberry pi targets | expand

Commit Message

Zhihang Wei Nov. 10, 2026, 2:29 p.m. UTC

The override-specific += assignments in rpi-common.conf accidently
replace the base values of IMAGE_PREINSTALL, causing common packages
such as systemd-sysv to be omitted.

Use the ":append" operator to correctly add the required packages.

Fixes: add07ce3360c ("Add trixie support for raspberry pi targets")
Signed-off-by: Zhihang Wei <wzh@ilbers.de>
---
 meta-isar/conf/distro/raspios-trixie.conf |  2 --
 meta-isar/conf/machine/rpi-common.conf    | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta-isar/conf/distro/raspios-trixie.conf b/meta-isar/conf/distro/raspios-trixie.conf
index 06deab85..77fbce8d 100644
--- a/meta-isar/conf/distro/raspios-trixie.conf
+++ b/meta-isar/conf/distro/raspios-trixie.conf
@@ -31,5 +31,3 @@  DISTRO_GCC = "14"
 DEBIAN_COMPAT = "13"
 
 DEBIAN_STANDARDS_VERSION ?= "4.7.2"
-
-IMAGE_PREINSTALL:append = " systemd-sysv"
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index 436bac51..d216df54 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -21,9 +21,9 @@  IMAGE_PREINSTALL += "raspberrypi-sys-mods \
                      systemd-sysv \
                      udev"
 
-IMAGE_PREINSTALL:bullseye += "raspberrypi-bootloader"
-IMAGE_PREINSTALL:bookworm += "raspberrypi-bootloader"
-IMAGE_PREINSTALL:trixie += "raspi-firmware"
+IMAGE_PREINSTALL:append:bullseye = " raspberrypi-bootloader"
+IMAGE_PREINSTALL:append:bookworm = " raspberrypi-bootloader"
+IMAGE_PREINSTALL:append:trixie = " raspi-firmware"
 
 IMAGE_INSTALL += "bootconfig-${MACHINE}"
 
@@ -33,9 +33,9 @@  IMAGER_INSTALL:wic += "parted \
                        e2fsprogs \
                        bmap-tools"
 
-IMAGER_INSTALL:bullseye:wic += "python3-distutils"
-IMAGER_INSTALL:bookworm:wic += "python3-distutils"
-IMAGER_INSTALL:trixie:wic += "python3-setuptools"
+IMAGER_INSTALL:append:bullseye:wic = " python3-distutils"
+IMAGER_INSTALL:append:bookworm:wic = " python3-distutils"
+IMAGER_INSTALL:append:trixie:wic = " python3-setuptools"
 
 IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
                      ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"

rpi: Fix override syntax in raspberry pi targets

Commit Message

Patch