From patchwork Tue Nov 10 14:29:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5599 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 10 Nov 2026 15:32:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6AAEWROY000861 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Nov 2026 15:32:27 +0100 Received: by mail-lj1-f185.google.com with SMTP id 38308e7fff4ca-3acd67793f2sf9125441fa.2 for ; Tue, 10 Nov 2026 06:32:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794321142; cv=pass; d=google.com; s=arc-20260327; b=BtKIQEcsLbltIMVcm+TwVRW2mmwLobrRQQ5tsGeqE8NJkfdTKYOUF9KXT/4KdTMw92 vH2bAZGmN/zQx44rpBOGd4C/KL1PfO8XSPxVPP85w1o9jrftqG2u3RtbhbraAE5rEURk kefDQoIcQis1sRAWWjzI9mUgI4Wr+rIWZPG0KMnRqhY83lUvsnVp+71fG0TPzDCGrTjH 6dncZvao5/WaGwjVBEu5gAU0CH2LwyyMvRZmfvyqadcvdSOP6aeoEdMATJbmQIUIQJO1 ongqgl/m+o76dZAqXTdSGLuDojiRZnb322AV8XyOUlOWk2Fa+a8KfJzA5jLI9QeacF49 U9xw== 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:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=dD2wuaKB/cbkB1d779DszSTjUXqTZmeuS1DEwSWbNf4=; fh=hkcoUaTsRipXard95OzhuzR6ocS2M6ByQnvJ9ohLzkY=; b=XyAjkTBSXy9ue+3DYF893NfYB1T8eZ97relGl5VkDpx/6fd3XUjAW46EBUKrjxRcCb AqfwXVrnsCZwi9Ncfeps6ArpuxEOomS7hoPgiItexfCgzeJYh0gqgoGIar7Ui98DvcaT qRkD05O4kEjuMC++zG3Wyb+6sFiGvtpwYW0VshG5g1dfWtthK5ru489OInCiCgxrn8mI TX3WiaDgd2K2OiR+hia0sWYxj+xevfQcBz1s4ClGUUHwOT6/l/KoB0RGTv/rxseUFMWK q9Ju3eRyG8g54YGeJb9+lnd0SiQ2sG1PyGwIy40/OPer5jK9CMaiZSy7rR0ocTpdFh5w K23w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1794321142; x=1794925942; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dD2wuaKB/cbkB1d779DszSTjUXqTZmeuS1DEwSWbNf4=; b=X9JGr08LMt4Wfjxosrh3XP8k8yrNYNiUMMcuIXQxkR4XKYrxlbcDPqyVO4G6jLhtEQ VsyCqOkL6N8xbwhkJyd6VwsJDj5XFdjzXyBePTT3tKTsVV0JRR97W6KJFjo/pVfBxDdM TpC3QaE1tujhCvbdL8sDJXxD4XeMmp3sbkda77sIHA1LTYpcLiCZDKaXpMvWKZXNOJz7 rkcqaQTRgDoJForbn6onch/I9HoKtj6FlIIb7uoMVvNFpQi7sFkd7OooOdoE6d0LmcoO 9SNLbytv3zSCmH8LLeMU076qNO/IMgazP63t4KTV1KjUUda3gDIbgYOlz64D9e/+w/6e BbRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794321142; x=1794925942; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to:content-type; bh=dD2wuaKB/cbkB1d779DszSTjUXqTZmeuS1DEwSWbNf4=; b=o8AqATzgiaTivOTG2WkRsj8rwniIQXfbLSJPzfRThy6J4onzCatdu1vh5vF04iBN9E 0ij97dvKD0UHAJVpYLPDwNyVUE+MkiPbfHGdPqtWwE6botmN04eVPKSmvfVGJfmCuUx7 in6l1Wwv1PpRtkzB2YosmuXG0agTw4dAL+m3YzpEFAf7ddn5pkeMCI1vIFCICQGcu5iv YXk96GY3Acn/LAVU2pnpVV825F2x4vK0duY/c0lusr9mVsWP6cBKMQ4Ctyq3J27NLHSC ts2aSFQBB0xKRD4NidR99bF63P9P7M1BinnYVefC4aFUHlujTqECKPkGQVP0BNztpE7H Srvw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AL+hErEz5jjhK//F4apxp2pN1pIUd00LICZszBlBpOVyyXiiyS6odW1r6LxSBgZxGZCGjIkWb1/Wy4c=@isar-build.org X-Gm-Message-State: APuU4Z8hrzJ6eZPGO27KwEJNvGRC7kV0ktvBCaHH3nLIL/AzOCQcOqkZ JTKZq/mDVUJuixF45Vi1YAJ+6U6gyfX2+hBcRMtkBM4aSrwjKzaom9uT X-Received: by 2002:a05:6512:1151:b0:5bf:cabe:23b5 with SMTP id 2adb3069b0e04-5c156ed77c9mr875731e87.60.1794321141672; Tue, 10 Nov 2026 06:32:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLdd3RFLMujWOM3xnuHlL+bGZll1vWaArqzqwNoHCmLxFEw==" Received: by 2002:a05:6512:3d0e:b0:5bf:ec95:41da with SMTP id 2adb3069b0e04-5c148912fcels808437e87.0.-pod-prod-05-eu; Tue, 10 Nov 2026 06:32:18 -0800 (PST) X-Received: by 2002:a05:6512:1324:b0:5bf:e643:cb75 with SMTP id 2adb3069b0e04-5c156eba4f0mr978983e87.48.1794321138127; Tue, 10 Nov 2026 06:32:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794321138; cv=none; d=google.com; s=arc-20260327; b=Ku3Nyt48gYwwNLtsIq09a8LtTBK0ym3pERK3qrulAujIW9X6Tky4GTblO1UcNXVZM0 AMxaVG+l7WNBPIAykKVhiAOHlYbpPYlZada2zVB6PAqDZmlqsrTXfcf/B14p17INqOQq PCqwRSJs38TsU24jgmAj+ITwzpI7qR4/n5GdjS9fm03ytiSduVz+PPHt1rAI8FiGk8Qk 07lBQAM+Dzt2mSGIM+8eXD1C/SCbx0poJ0t8FbKXL6dvij9wO0g/75BQaSGN4uQds0vZ f8/7UxMpRsVcD7bbws9Za6Jm71fx4w7Y8Yj0wf11VMEIF5BegVTljIopzTZY2vgljtWS J3xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=4Dv3f3VYwXdxhI7h2QehYeH9j4BQmLmGUNmktynQ2fk=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=JJrCaO/qyd9PIz5t31WacBKW2ZXyvqI2UAemECmTdMjRBvNcQRMulRJEbFRX2yFanm 6cDKFZyAIGtDK3mMAEdH6gwGT7z4k1MLeMe7YIt5S/ALziENUWua5xGRmXqoPCrVmrYx Z7r3z3i++8lKvcDbVSUMadCsrW2XZAhw/8Rq7Fs/TsYNGHvzyNAa9CqHYlttPIDB8T6C vkcA7vrk4l4GAHzEFPTTDHF/MPl5OtlYPCAtn6DPHa27PDc7PxEJLGxV3tY1H93VJ4kZ F3i37f7B0qvqd2Se3QkGzS5BSMdzgwK08ojIITk7Y/6kG+kwR7yxv3tct/DuP5Rj0SW7 f0ww==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5c159c58ddfsi18378e87.0.2026.11.10.06.32.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Nov 2026 06:32:17 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (dslb-188-101-247-215.188.101.pools.vodafone-ip.de [188.101.247.215]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 6AAEUGOt000844 for ; Tue, 10 Nov 2026 15:30:16 +0100 From: Zhihang Wei 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> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,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-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 --- 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/"