public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Zhihang Wei <wzh@ilbers.de>
To: isar-users@googlegroups.com
Subject: Re: [PATCH] rpi: Fix override syntax in raspberry pi targets
Date: Fri, 13 Nov 2026 16:31:34 +0100	[thread overview]
Message-ID: <204cdc26-600a-4fef-b6cb-6a0dbf9b35ab@ilbers.de> (raw)
In-Reply-To: <20261110142953.2397231-1-wzh@ilbers.de>

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.

      reply	other threads:[~2026-11-13 15:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10 14:29 Zhihang Wei
2026-11-13 15:31 ` Zhihang Wei [this message]

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=204cdc26-600a-4fef-b6cb-6a0dbf9b35ab@ilbers.de \
    --to=wzh@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