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, 16 Apr 2026 17:41:22 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f64.google.com (mail-ej1-f64.google.com [209.85.218.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63GFfL1R032443 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Apr 2026 17:41:21 +0200 Received: by mail-ej1-f64.google.com with SMTP id a640c23a62f3a-b9c4d00d361sf735646266b.3 for ; Thu, 16 Apr 2026 08:41:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776354076; cv=pass; d=google.com; s=arc-20240605; b=WCdfuCYYGloRQU49l69ZkiOpjmjpVP0+Ykn4SuqincwmLAALwE6agl4RC195zKthgV c389ff1CRIGosP9xH7Vgj9ygGYFaNIgzso2eGSJ16xIIt+GwYn5LvByaWJgxeQfb4uET RMOtvCePCesiZ8/rrW2OUF6cI+FI21GUDw45twcxex9PTVvbtqyLftXwTlSHiaR9d0D7 bzCma7xQfbsP5HBzlF+fkQxWirrPkRVOAn0peo6EN/te7PhyLMeuWc1ZvwDdtYEgacht G3Xz+MDmVSAtlKdlK4rlHV5TxOWIQ6FMi2PLrL6NwoQ0Q8ebd0nLRO3LVRCemvZjKwXn OPrA== 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:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:dkim-signature; bh=AnwdH9MJCPKujLHuQSkTFCQqgkH1TQMF3jgytvf21Qg=; fh=FYOqaWOWgDCvuMmwREpr10efHUjiwcYY/sGAppHt5DQ=; b=Rpizya5VvhWhU1Rls3+EamEBU5zSiYPEIw0yhOJCD0QdAwqHEeQPLTzHR2xpWjHfhV /eVbQLxEHBvCkloQFB1wkz7p1a5vgHsQpohsmlKX065c8W5Z5C+SbWdQwSmtn4l0jqmx dvewSHva1EXhZyIt1tJVedlRyvF7arJeW0P4y0hwKF9dgwC3pleJHHTN2WJ50JwuvJyj kQ2pCJrp2JRcQjrkrKBn7Wa/8B94WLXw9ont6sGvfVB1x8c0ZAhkGIKg4NW4Z43k84iC mvHhc+14KYZUlr1p0NK31afPxdJwkpv9fy7mxDbiuazkEvvp4zphfogl4qwktRhDaNhq IDRQ==; 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=1776354076; x=1776958876; 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:in-reply-to:from:content-language:references:cc :to:subject:user-agent:mime-version:date:message-id:sender:from:to :cc:subject:date:message-id:reply-to; bh=AnwdH9MJCPKujLHuQSkTFCQqgkH1TQMF3jgytvf21Qg=; b=AxBWIuRb4/t3yPkGR8xeMGM3VGVlAZcemSisZcy0pALIOoMDm74P2xtOrFTLan+R9R 6Lvwhm7rh8V+IPLbvJthiTbtsVXTeoC+0nfXhxVoKxMnK5a1JWHDyOyBDPCh+eOrTuh5 3CoA1DZg0A1ZIpLoaQjBNWGJkFnYcJD1gw5oibf4R/n+gPxSJkjG2PBfvuZGSGbmQZan SywCEnzHSgk/6JIQ8y0PhxV18g66As00eGg+X3cVSrpaDxpa8FV6JgjXj4SExBh/YSDs ptYhJKcNT6SAWfjJSjPp1OACXeuuhn1xDeve1nyvU409YUBoF8b/5eLgW6texxv4qsc0 pxtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776354076; x=1776958876; 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:in-reply-to :from:content-language:references:cc:to:subject:user-agent :mime-version:date:message-id:x-beenthere:x-gm-message-state:sender :from:to:cc:subject:date:message-id:reply-to; bh=AnwdH9MJCPKujLHuQSkTFCQqgkH1TQMF3jgytvf21Qg=; b=iFC4OUeehIzn1TXsI4F5H64wuIFHqiuCTqSSMlmcQul5V2HVOGIaf68Acot0UKkokw ITp4DoJw0RPUsK0Ch/6UKRfAMPSHFGbg4Nhl9yNhQ4cGEW0ssS3+KAQG7iAPoopkODS5 Ajvtfu74AzmYigFbJiO7vaQBY+s44bB1VGe2as/GSGk7LEjD977g2vmVv5nLg4qZnocS V18F9PjufdvVQ54QG4/MRYhGuGR+REStCbRLqgl35+VCz8v5XGEXBYyZsSEIGZTg1vnP yqH/+KkNTikQllEf/zvcpaG3/Re2j30+dUPhpcke5EeuU7R786VmKROU7+CRdvhddYtz auBQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ/JmtGhh6vOpJQD1+aXzokVr6OU3/NrMmlN2q9p5aXBq2UYZzYQBpYmrzAooO2zcoeNC7N8@ilbers.de X-Gm-Message-State: AOJu0Yz8PHIKemqO27L41ale3jIncPkZDGcfA3j63cGL0pXDTYLVMpHm ob+xtqGhbTQ4COLK9Vh0tkGToW2zgWXfiueWbYIWo96uVHNS1jhpcxkg X-Received: by 2002:a17:906:fd86:b0:b9e:1e9:5c01 with SMTP id a640c23a62f3a-b9e01e96079mr1041944066b.35.1776354076012; Thu, 16 Apr 2026 08:41:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiLNazcw3yoOvJe8PiqP7D9BiWeUmymfj2uxJ5vBp6GDaQ==" Received: by 2002:aa7:d509:0:b0:670:aab7:480e with SMTP id 4fb4d7f45d1cf-67271822b42ls930955a12.1.-pod-prod-08-eu; Thu, 16 Apr 2026 08:41:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ+UVAMdk8ztY2VQ0nXMWToIIsJSm/r54t/ba8U/yAe3QOHFREPseO/her8vmpq/v2VTBwyU6/Y5fZ1f@googlegroups.com X-Received: by 2002:a05:6402:5054:b0:670:8b7b:51b1 with SMTP id 4fb4d7f45d1cf-6708b7b5274mr10243771a12.3.1776354073802; Thu, 16 Apr 2026 08:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776354073; cv=none; d=google.com; s=arc-20240605; b=WX0Xv9GF1zvsA7kfs/HNd1bVEQkOXwRJgSiCPsONYY9m5efrZBVrR2keAKtFsIR/Qs Jpq/MxbIVFXHAX9lvN8p+e/Gvdym7zTLeubxT32NDJnm+f89E1NA/SSr25Z+MNbjwJi9 F62qbBe97cA3aYPh5FvhMyCQAIsg4b/F9CaPIgx3n9bsmfNwKaFJYJLwJEEXIbKzD0aL CgmbbVHq5g7nAbswCdAYQC/G2ugZ7++b6rW+LVPuR4Wr6ttsb/rwy2UtU3WhwgOLmgdy QW5JaeLpHvDpxjNBSy5wYSdN7Bs2j3rEmKI9XDHdexW0SLE6xouI5TuIDxoGyh4zYv0p krag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=1QjvlOVKByEaHmS+K3Oe5DvxV0G4wn5Tk4u7NIGvJ54=; fh=snPUeFaciPd44DGD7CKIfMxKy9UIWquFtZirq2e+a3E=; b=eL6iy1A9EBV5O72CZQykdr+gnsRI2H3hE5NiD/j4BzzE0VX67AnZAcnjoB6KXRUlbh TRAE6Z92Jn0DK+8EgAt+w3Xl8njuSzdIi66Lu1ZRP/Vb5HfdjisVV8blyyA9Wf34qDeH mlR07Rv3nvV53GWHA9Cs0lOrjovz7+RlXRf0ea5dYkQFAU8eJAjOMJ1Tm+VCRzg+kH5G 3BlxL3Xn7bGrWfNbYvoGGzFuMJXfo/Ox7XGCEHRS/TYcyQvT7Ozj0pounJyg4OcohJES 9chxADogoHkJuyp8JTf9X5jAVoaGmQl+7Vo9AsukFpxOM3AUKig2LhHdkoVzQvm4L532 DDDw==; 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 4fb4d7f45d1cf-67237cf6e13si105844a12.0.2026.04.16.08.41.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Apr 2026 08:41:13 -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 [192.168.178.148] ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 63GFfCAU032431 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 17:41:13 +0200 Message-ID: Date: Thu, 16 Apr 2026 17:41:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] prefix DTB files with PN in deploy dir To: "MOESSBAUER, Felix" , "isar-users@googlegroups.com" Cc: "Kiszka, Jan" , "Gylstorff, Quirin" References: <20260410132250.3320171-1-felix.moessbauer@siemens.com> <20260410132250.3320171-3-felix.moessbauer@siemens.com> <4f80204b325f81dd49350c9e03fdc610e0cb188a.camel@siemens.com> Content-Language: en-US From: Zhihang Wei In-Reply-To: <4f80204b325f81dd49350c9e03fdc610e0cb188a.camel@siemens.com> Content-Type: text/plain; charset="UTF-8"; format=flowed 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-TUID: T/yTVBf83IAi On 4/16/26 16:39, MOESSBAUER, Felix wrote: > On Thu, 2026-04-16 at 15:54 +0200, Zhihang Wei wrote: >> On 4/10/26 15:22, Felix Moessbauer wrote: >>> As the changing of the DEPLOY_DIR_IMAGE has proven to be fundamentally >>> incompatible with custom initrd recipes, this patch was reverted, >>> re-introducing the do_copy_boot_files error on DTBs that are named >>> equally but belong to different mc targets. >>> >>> To mitigate this limitation without breaking custom initrds, we prefix >>> all DTB files with ${PN}-${DISTRO} when deploying to DEPLOY_IMAGE_DIR. >>> On imaging, these prefixes are stripped again by the imager scripts. >>> >>> Signed-off-by: Felix Moessbauer >>> --- >>> 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, 27 insertions(+), 4 deletions(-) >>> >>> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md >>> index 0e6a3172..856da5de 100644 >>> --- a/RECIPE-API-CHANGELOG.md >>> +++ b/RECIPE-API-CHANGELOG.md >>> @@ -981,3 +981,23 @@ 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 >>> +--------------- >>> + >> The last three lines should be kept. >> Also, the 2nd patch to add prefix to DTBs needs an entry in the >> API-CHANGELOG. Apart from these, we'll apply this series. Zhihang > Hi, > > which lines are you referring to? The "Changes in next" line is in > there and the added prefix is documented (see below). But feel free to > just adjust as you like. Sorry, overlooked this part. Please ignore. > We still need a decision if the "meta: Deploy image build artifacts > into distro- and image-specific subdirs" is JUST reverted (including > the then broken test), or if we switch to the API proposed here, given > that there might be another breaking change in case other artifacts > (like firmware) also need to be split. We agree to switch to prefixed DTBs. That would be at least a workaround to support the Trixie targets. Zhihang > Anyways, I really like to move forward - this way or another, as the > ISAR 1.0 release is currently not usable for us. > > Best regards, > Felix > >>> +### 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 26a4ec06..9b5dd23e 100644 >>> --- a/meta/classes-recipe/image.bbclass >>> +++ b/meta/classes-recipe/image.bbclass >>> @@ -379,7 +379,8 @@ EOF >>> KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" >>> INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" >>> # only one dtb file supported, pick the first >>> -DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" >>> +DTB_PREFIX = "${PN}-${DISTRO}." >>> +DTB_IMG = "${PP_DEPLOY}/${DTB_PREFIX}${@os.path.basename((d.getVar('DTB_FILES').split() or [''])[0])}" >>> >>> do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" >>> do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" >>> @@ -402,7 +403,8 @@ do_copy_boot_files() { >>> die "${file} not found" >>> fi >>> >>> - cp -f "$dtb" "${DEPLOYDIR}/" >>> + dtb_name=$(basename "$dtb") >>> + cp -f "$dtb" "${DEPLOYDIR}/${DTB_PREFIX}$dtb_name" >>> 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 dd6c501d..c0813223 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" >>> +WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE DTB_PREFIX" >>> >>> 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 6bc78d42..32b220fa 100644 >>> --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py >>> +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py >>> @@ -57,7 +57,8 @@ class BootimgEFIPlugin(SourcePlugin): >>> if dtb: >>> if ';' in dtb: >>> raise WicError("Only one DTB supported, exiting") >>> - cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) >>> + dtb_file = "%s%s" % (get_bitbake_var("DTB_PREFIX"), dtb) >>> + cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, dtb_file, hdddir, dtb) >>> exec_cmd(cp_cmd, True) >>> >>> @classmethod -- 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/cefad8b1-5ff3-4465-9545-0d0846bfa1c5%40ilbers.de.