From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 30 Apr 2026 15:11:11 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63UDBAqx025086 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 30 Apr 2026 15:11:10 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-38e9c93b90bsf3863521fa.2 for ; Thu, 30 Apr 2026 06:11:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1777554664; cv=pass; d=google.com; s=arc-20240605; b=NqFS1rhXSRpsUGUrKT0+qBBvSOZTVnJDoEzvKi9eiifmaaiVgBjvYBbG0bh5egesTm Yj/VvddAU7g2wfwdVizlg11xqXHf+Qmwomdvwdlqo2u+ioPsMcpsF8CV5c5SxXdKzxu9 G0aA+8Yv98vC+PudzrR008T/GpF79uKB6WGogBq/FTIGYqoBYOGwKWRMcz0XFuPbrW53 Osvkcwgg38sxGurEIT1gGFYBCrlmeK5QtqudEuvVjw3zcCtVvohx040Zs0xImdt9LsfL vCGZuIq5cer7savT3XsVIsEcn0AQ2IIC9pflHRl62M4Tgiwp2xXNb3o3jU7mIAEc0FZw U0xQ== 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:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=yL06GgZzU4XLqtkXC1rm6YGffV2XG/ZGWAVAwMokYLY=; fh=PwJZECJXAaEqUS9nBvwjig6717UicgXes9kqC8uRwIE=; b=H4JT0fTnLe74GiwuVb55MmIuIdumzGZPSbM8zGIAl/Vtx3dcgLr3nMmDGogGx3MoSz rNWopOWdL1niflG2tEQSAeOeRPEucDe80dxH0eog8zZ56BZicxr52B/l2leNggTVSkiU xr94fxIaXuDaAwn1lmoRDx0DOqwcVGjWEIpMgn6Ud1ZZIlJrtK2xh+VtvXG0MGOGYguk eW1N+eKVf8p3AQwTLg4YQI7kxuM8p52kQDEgv7JYBrGTORvkM4XcdVtC31pNsNX3x81t yqeJ2BhtEINQzlQqUxP0ZM9Y0J6mrbJKVF+V94VeM12IUg4PkQrg2QDSJVDtcOUoxGrD U5AA==; darn=ilbers.de 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=1777554664; x=1778159464; darn=ilbers.de; 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:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=yL06GgZzU4XLqtkXC1rm6YGffV2XG/ZGWAVAwMokYLY=; b=CcAgFMQYGtulj6mE+BEn760DIJb5EjDmULO0CmUZyzUCqQIMID5O+qF3maFHTfwZwY VRLGPc12NivHzIHtVm35017Y9is0YDrur6eKPtELCnTdK7gwYNBhSHfQOgw7XjWZivcz ZhwLRknGjBTwY1fvAGASxtMgN6Hn+D1Uqat58XarVq/hWV/UvL49oX48/A3xfi5mqpku j+mVkKjn7V2U+fNBYVgQ+qvspkpRyRQge0XDrEpI3fMfHgk88xaKF+fqRzZRHOx+acCs 8N16dHFw6Qzu/CNczoKHfhGk7aFZQ9KnsKkvQj6ZqHT3pPaTvikniBLy7hKAUruHRNsg zmJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777554664; x=1778159464; 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 :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=yL06GgZzU4XLqtkXC1rm6YGffV2XG/ZGWAVAwMokYLY=; b=k3K6xQC+oVO9EV4A/Ai13dd057yPl+Ni/p30f62GSS94I4iL1SkExKldYWFxhe+rk4 dETPOeJf3CSuU6Q0kO7Bfc8CcXTuwgz7qAp6zhTcsQDBRbEgXhk6lRrWtz7L9812nvJG KG6O/545fCcNm/Lw5eavvsO3FpuSE4bhcg4JbN5wYvBFv1NgWEOUe5OazGbl9GjSimmA p+HR+k27rTpwD30sp8NV/My2UnqJgoMC+QSohHbE8Xc6tNle59OwiV5RgIdzyIsDNoKM uKyKP2G6JaCCmc8YILADLJsU+x7VEqWzsBguElPZNoz9nouS6o3jI0Kh0HIvX0O7phlO 74Wg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ/L1EMyaznEbPeKPgVd9G5PMsuyKR4iQ4CVgw1TDAGN/TTBis5pVscLOMA0ppOkkKpnKgYs@ilbers.de X-Gm-Message-State: AOJu0Yxxvxhh31lNnMoViD0HSodH5CbBjSXXFCRi2R7P94JnQNmg9oPe SOfukakif6DDiBiHzBD7n84DJnos/M4UylixpK8EU3k2XKnJOJaxSMTv X-Received: by 2002:a05:6512:318e:b0:5a7:477f:41db with SMTP id 2adb3069b0e04-5a8522bbf49mr977881e87.10.1777554663403; Thu, 30 Apr 2026 06:11:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMMShZ1ciJmZkV9cFXBLsepWIK93K+r7I26YekqxyeJ8mQ==" Received: by 2002:ac2:5ec5:0:b0:5a2:8c41:339e with SMTP id 2adb3069b0e04-5a8516bff54ls268471e87.2.-pod-prod-09-eu; Thu, 30 Apr 2026 06:11:00 -0700 (PDT) X-Received: by 2002:a05:6512:1447:10b0:5a8:52ab:af10 with SMTP id 2adb3069b0e04-5a852abaf17mr764938e87.29.1777554659844; Thu, 30 Apr 2026 06:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777554659; cv=none; d=google.com; s=arc-20240605; b=HdOiWk7I4ARqzOy2YSEu33Nez/29BKNyAyGSmhmHbxrAWCJ4LV3kiTU0p7VuQQY8eX Q2dw2px+655+PK/nTWV/iibsAPlLPUsKpOWGtcMDVaEUusCMFu6rgrDibIRYPfYo12sj cUQJ3Xt5mECMLtNHGzbJ09hbjEF8Y/LCygPHOItLmot1qYV+qXr1OHx7TrFnt8K5hx9P ZMFDNZJHASen+aCoookcvCbVQIuOJEYHaf4YNgAM0GFcZ4pznXll6zyy+t4JK3qU96R5 HO0hSk5SxO5LLlOSVH8dYgV3390VKOurRLTRHyZw74baHkGrcX8ttrE+CvV+pbTTuNo1 0TYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=YscgdMK720cpaB8f3h9vTFTmYj+8sHRfjWeDgWnR1Ak=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=abuKwcUPybzas6R0vuUHvb1es0U/jD1IiNZf0V+RKTCozVeh+u+iMeOwEwSyWGUjr1 bzgr6b+/7VDXtNUoX3L//E7GUuNLxih7oWpxPuVrmmK6qLwxDs6lSV6E+SpdLlJfEhub 7lqqCRaPBIe2Ci8Lk7mQPwPemKkwsXkvKgkGr1vIVEC2KjZEj+rBINBMdQPnx9Q3u+Nm kKEp5hMGez+K9SilP4mpA0Rak/S2W0fm348RMdapEd+DP/ruqGo9pDluoG39hpJaYiRX 7WszLJt8W3ea8i42vHSvB4i/O1AfX/0r3aVsfkey6yGeSq+ng3n2FlYXXbwIhfkrf8oE sBDw==; 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-5a74a742a2dsi107378e87.7.2026.04.30.06.10.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Apr 2026 06:10:59 -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 63UDAv3F025033 for ; Thu, 30 Apr 2026 15:10:58 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v2 2/3] Revert "prefix DTB files with PN in deploy dir" Date: Thu, 30 Apr 2026 15:10:56 +0200 Message-Id: <20260430131057.2960671-3-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260430131057.2960671-1-wzh@ilbers.de> References: <20260430131057.2960671-1-wzh@ilbers.de> 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 Content-Type: text/plain; charset="UTF-8" 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-TUID: /JNlQHnM8lPn 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 -- 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/20260430131057.2960671-3-wzh%40ilbers.de.