* [PATCH] rpi: Fix override syntax in raspberry pi targets
@ 2026-11-10 14:29 Zhihang Wei
2026-11-13 15:31 ` Zhihang Wei
0 siblings, 1 reply; 2+ messages in thread
From: Zhihang Wei @ 2026-11-10 14:29 UTC (permalink / raw)
To: isar-users
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/"
--
2.39.5
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20261110142953.2397231-1-wzh%40ilbers.de.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] rpi: Fix override syntax in raspberry pi targets
2026-11-10 14:29 [PATCH] rpi: Fix override syntax in raspberry pi targets Zhihang Wei
@ 2026-11-13 15:31 ` Zhihang Wei
0 siblings, 0 replies; 2+ messages in thread
From: Zhihang Wei @ 2026-11-13 15:31 UTC (permalink / raw)
To: isar-users
Applied to next.
Zhihang
On 11/10/26 15:29, Zhihang Wei wrote:
> 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/"
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/204cdc26-600a-4fef-b6cb-6a0dbf9b35ab%40ilbers.de.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-13 15:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-10 14:29 [PATCH] rpi: Fix override syntax in raspberry pi targets Zhihang Wei
2026-11-13 15:31 ` Zhihang Wei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox