From patchwork Thu Apr 23 12:19:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5047 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Apr 2026 14:20:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63NCJqlr009226 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2026 14:19:52 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-5a2c0da6fc1sf5769403e87.1 for ; Thu, 23 Apr 2026 05:19:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776946787; cv=pass; d=google.com; s=arc-20240605; b=UJYEmsbAIHy7mt2fPL7MoWuzQKnzWtgB83b76QgCusTsPfWCjanura3U9jWouXdCXl SwDeaLeAh/HDddgGg1+x/EFNGXVnC37TgdirjjqNISvnfeHiX8htmX3w/W7NXVlrawOA Ip4hnYRhIDKSHvq2gSMKsUHkNg1xcG1wYupu8Ld4DGRVzLAiOEDc/+AP651xaUn6JxbS QZvpN0ZYhd63LRifOFliN5GopOCrNbz/R5RIl2MxxSuCrxp/5UTzSAwg13a+gUNivvqv y+efPBAhnjTW4Ge5C2TMmqyJt0oKR8r27fQB0WsPundO2asD8Ao3g/+jVDct52aRfUB2 dWoQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; fh=Qjlbu9btgK8a0Hr2RMuiOFYDdWVwwvUZ/d3TA7Dj87A=; b=jOPYIglmAyaLz84SUTnX9b8gaUf/BXoNTrgxypAf2assGoRm8HflMNls1I8Z6jQ9YV hgSAZ9Ul4AmBJya98zVm3ueIfDRthlPM/Fxzq46i3ANFPWq86Gz+UtJdACN9oCxXFhkk XdvXSv8s2Mq9yK46xr/MmSkp9usLO1BQLJRb+ukLSyiJOA7IRPeN1vGUWyBKmuGTArJH uq6CeItb7BJy9Gwt39V3LMHf33M67I/VdyxHvQOTnNbGYCZZzvKMDEC4AlJRkNZ7jnkJ LI6S3YGn+piUEi/XK8EJhmclNd1u3foxK/uQ1QDLfU/DmFscg3eZnpc1zTjF2McT738J jsVQ==; 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=20251104; t=1776946787; x=1777551587; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence: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; bh=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; b=gDhBPFPzUp1v/u3ytJRs68rOnecJv3CI6MhMTnMUim0wZ2Bvq6+XjEhgCzgRj1nnnu 8dd5hpHaYJ1MK75ono7wAzJAaSphGhicaQk1Ber8PIkjUz1wHc8Tp+TNJdHULNHbIDUo Rp8Y3WZQcVr32iwqDhIx3J55jcp3bZhK9wV5TChitcKFBNE1TRF7cxFrQdkdA/8IvsVj xrJvuJAnGXwC+kV8ylF1Yph7v42YJKWLOB5dr9JFK8gbB3wrdDy2fjqt+K87q4xtrbDR UsiWmSWS9Aadf79JqJCtckUelyqNynZz67qdZAwCTveD4qaxmLQejzjxGHV0dmMXzYfm x/dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776946787; x=1777551587; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :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; bh=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; b=OndbcBCAp9P+Llqrm5dYuA698zkRscBfqUypqMJsjxsWXRii6v3/1KdekDGh3dVHiO 5SDxP/Nr+ykAHOQ1OsOr/D3dJd+vW1sputG6zDXwAXmRAFMn+pbMhKHigMbYt9BQsCr1 rSWhl0d8HvOCvg3YwFoaRRAVKcPUgPdJcApK3USw0mFj1RjobUyqsL2CCNQcEc6D3xHR bjvQyAZl2IY72cnMAVqXjJ+vTQFF/BNj2Wg1BGkRAOIIfB+IvcnZnetNwtKiKBJaLUKq sQ8vPEqYBd9ZjdP4NfsCcAKu1wgBKOH6Ggqh16L46rjSSwkxBeF1HmcOeKGkHF1cRLLg oXrg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ8e6Jq2VoT4eV2TC3RWe8vRsrdOhHcu6SjTUXuBpPmTFySHErMn33izoZddfEw/2MWZusTmzus=@isar-build.org X-Gm-Message-State: AOJu0YwLPjcFfYbvYsyWZbZcpja/QAmgIjq3zgi3gzXUKGKF4L7l4q9+ fo6csshkJIldHR7YoZD7rRfdTWAMJh3G88uxFQFrUKCFz4puUInX/LXD X-Received: by 2002:a05:6512:1191:b0:5a1:1de6:bc66 with SMTP id 2adb3069b0e04-5a4172a32bdmr8053339e87.18.1776946786826; Thu, 23 Apr 2026 05:19:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiI0VTsRgG7FmKho/U1Ff0E1yymhq0ZpxazJM0/mSngv/w==" Received: by 2002:a05:6512:3714:b0:5a2:c093:42f0 with SMTP id 2adb3069b0e04-5a40e445012ls956799e87.1.-pod-prod-00-eu; Thu, 23 Apr 2026 05:19:43 -0700 (PDT) X-Received: by 2002:a05:6512:211:b0:5a4:1ab7:77ba with SMTP id 2adb3069b0e04-5a41ab7782dmr5041719e87.8.1776946782836; Thu, 23 Apr 2026 05:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776946782; cv=none; d=google.com; s=arc-20240605; b=HgNZ4Cw3hITRd3EdxeWv/Tvha3eD3+YNDhYYVWEdfh/Yi2dTmd/uQ7jcVhFeoa9QHJ cFr9IbUzd21pKV2KcDQREiZF3gbgzDb1sgYUqlVTP0aOaMqjYNStBGdXQ6/b7kFL8fqk S1FYbQP2ilfsTjFKi1pnLyoMOEiUirayKzff+4D8Xq7NMWVYDNhRC5eAQBmMfv/RplX/ 8CnfSXDPuoWJWj9K8qa4FW6uVaBtzu8QJ8Z/iS6fElvjMztgijbCOwiinkDZXk6xIJf1 tq1lvqg/xambobkWRAvBzWODN7ajZs36/K6dKyqGRB4ckFjCTy5DFpjP1L63azNNJat3 AQ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=YscgdMK720cpaB8f3h9vTFTmYj+8sHRfjWeDgWnR1Ak=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=T80xOoDYGJzSI3X1w8VjFyZT0AHYTe14pZN+yJOz4j0SUxpaE3Ja1YlNxWR/m3jCh6 Tc9uCSV1kVV3XRMvUf9g7cmzeykEy2pZ7tEiufw7vTpGr6WgLb1DWY6gY4SbUeP3aaEl ZzAmIhV8xuBDjArVEZcJ7x2OVd64SNENTfcK+avXmmX+7VY9csTpWeYsBy56vrJ/bnL7 uiqGfTY+ntULr2bLRRfQbbnh7B5yDyKXnDB5oWw2Tzgz+5mT/bEiKpnhMWkXL/2VM0J7 1x/HYcESK+ZrgtGmo60oxA5fV2A79HJoSM7PWiIyeFSLhG+GosdssYmd5znad8Le3505 uw6A==; 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-5a4187dcf74si351149e87.7.2026.04.23.05.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Apr 2026 05:19:42 -0700 (PDT) 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 debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 63NCJfs0009189 for ; Thu, 23 Apr 2026 14:19:41 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH 1/3] Revert "prefix DTB files with PN in deploy dir" Date: Thu, 23 Apr 2026 14:19:39 +0200 Message-Id: <20260423121941.1704827-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_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-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?= This reverts commit 8c34bb25b800d2d0d32a5154f87252a199cd902e. The approach of prefixing DTB filenames has proven difficult to adopt for some downstream users. Additionally, a general solution is needed not only for DTBs but also for other artifacts that could cause conflicts in multiconfig builds. Therefore, the patch is reverted. This revert may re-introduce the do_copy_boot_files error for DTBs with identical names belonging to different multiconfig targets. Signed-off-by: Zhihang Wei --- RECIPE-API-CHANGELOG.md | 20 ------------------- meta/classes-recipe/image.bbclass | 6 ++---- meta/classes-recipe/imagetypes_wic.bbclass | 2 +- .../wic/plugins/source/bootimg-efi-isar.py | 3 +-- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 856da5de..0e6a3172 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -981,23 +981,3 @@ fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to `KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as part of a repository, a tarball, or some other directory structure, just specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`. - -Changes in next ---------------- - -### Prefix DTB file names when deploying - -DTB files are now placed in the ${DEPLOY_DIR_IMAGE} with a prefix of -${PN}-${DISTRO}. During wic imaging, the prefix is removed again, so no changes -to downstream wks files are needed (i.e. `dtb=my-device-tree.dtb` is not -affected by this change). Custom imaging plugins need to be adapted to this -change by removing the prefix from the filename. For that, the variable -DTB_PREFIX is exported as bitbake var into wic environment. - -This fixes errors when building different distros with the same machine, -whereby previously the following error occured: - -do_copy_boot_files: The recipe isar-image-base is trying to install -files into a shared area when those files already exists. It happens -when some files have the same names (e.g., dtb files) for different -distros. diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 9b5dd23e..26a4ec06 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -379,8 +379,7 @@ EOF KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first -DTB_PREFIX = "${PN}-${DISTRO}." -DTB_IMG = "${PP_DEPLOY}/${DTB_PREFIX}${@os.path.basename((d.getVar('DTB_FILES').split() or [''])[0])}" +DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" @@ -403,8 +402,7 @@ do_copy_boot_files() { die "${file} not found" fi - dtb_name=$(basename "$dtb") - cp -f "$dtb" "${DEPLOYDIR}/${DTB_PREFIX}$dtb_name" + cp -f "$dtb" "${DEPLOYDIR}/" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index c0813223..dd6c501d 100644 --- a/meta/classes-recipe/imagetypes_wic.bbclass +++ b/meta/classes-recipe/imagetypes_wic.bbclass @@ -107,7 +107,7 @@ WICVARS += "\ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" # Isar specific vars used in our plugins -WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE DTB_PREFIX" +WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS') diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 32b220fa..6bc78d42 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -57,8 +57,7 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") - dtb_file = "%s%s" % (get_bitbake_var("DTB_PREFIX"), dtb) - cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, dtb_file, hdddir, dtb) + cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) exec_cmd(cp_cmd, True) @classmethod