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 15:54:55 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63GDstnd031105 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Apr 2026 15:54:55 +0200 Received: by mail-wm1-f62.google.com with SMTP id 5b1f17b1804b1-4837b6f6b93sf67087045e9.3 for ; Thu, 16 Apr 2026 06:54:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776347690; cv=pass; d=google.com; s=arc-20240605; b=aMFlYvOGL0CB+cYguJOMQlsyz4Q/Fz/92s/apCG2cTkG4l/C+TibUP+i8w9gSwDJem 5JyAQPA0E6iu4F4Sb6rz5DGiV8+XiDJ8eKnPSGa7ITqytwgFvPm2jnPUmL8QymVthHEl 5FdTafcsYxh4V/7oBVD88iilOF19dVWDqqOkQ7mIyhRJlFAvSPHeEy2T2XoVOZqBRwNw 23ukIzHgVQQ8Db3HM0BGSwtZwrScAtaJla0oIh4B0pxXP9KUSpNouBvUs1FjNautPywf 52RKCyLQxeJ0sTe5JGI/TBR01dSGBhuajYh9jAO+23Ouz6xt3WV4OoUCPPNzpkB5+8zc FFLw== 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=vBjNipbER7Hkxuj5WurWbEHIHdwiwvtZOC0umzqeTWc=; fh=P7fgR8E4ZkSn6rSjLbAwt1F9Ss+qF36AO8lbXOriGXM=; b=WKXnW2TBXdjek/a9Bf5VDItYVSWuBmPN3xGbQ65zSQcHR9sNtgvCxV8qsSsdLCVwQw Y9/zioJPRE7Ie5l8288Cv4LsPlGFiaXm8huKfk0NXt5zD/bV33bOVODGfbpSWNwmMMXw YXpAKoYniNRRLvEos51+Mca710yb/SfE6leZx9wVmyouGd0Y5JRN+aUdR+bNby+KJtj8 /GDURLI7UnNAyRXMYgSca+Gk2TCP98zYYPPh+ajEi+7SRUIHQ/P4IZaW20nZxECURhVd om9eQG/p9pcRugUVtf+njDI/8oxQifnuZowlmf5jLtJVeSDosVOL75UBCLtDNmJs/tsW 700g==; 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=1776347690; x=1776952490; 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=vBjNipbER7Hkxuj5WurWbEHIHdwiwvtZOC0umzqeTWc=; b=mY8u9oLqd8jhLCSPL5giZCAxcFpse16u1P/fuHVKUwK+CXfo0e9pyrEqDyDNVf+3AV 1kL15BdJhi/pxTGKK1zKXcmr1GuTvHeaZPIUdlptIrmY4GN/c8GLVUDotvSl6LRTq49w 6HNZgQETenKvN58+C5UnGa9aWUPvqRLQHWRtA8R4eHQAaiLP94mplEVUKQOo0xDjF4Q9 N0KfxzWnjnOsovmbkQN/WxDkuJItogMusZpQq/Jb/yo6njT5ffa3MYb2DedlWn+sFrOe 4jE7UtFQoNJdFkZ6j1evSJDmXVJbgpahXOR1t/3w0rY3K/u/qfICsuSpVn52hYFEtOGa Q27A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776347690; x=1776952490; 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=vBjNipbER7Hkxuj5WurWbEHIHdwiwvtZOC0umzqeTWc=; b=pGxHoJKilNHI8vIudC3DVMPueMn76E08Uep8J8pq1PTbHZXEj7d+0yb/1goaiiLJ+1 +p1rfP0LQ7qxhr/acXaga0+tag8lQ4TxVIRz72Z/AZ7G5EocDUDqxCx51U99nMzdgZJ+ P8AAUxyT59Cz6/H03sg4LXnOZCNaiQWIkAnXbb2mQT3moBueI09KjDi61twu6hxMpp8J YTy0QSoE2xuaBcMwouNeQBUAslJM4KMBl2PhEGqfQNWo1rfdu8W+De2mKe0B04y9VLVQ M2hMmz/HO3fVO1zt1N0Vm0a6Pszk3OmrF3cJzDgT6i7jLBxF4e+EFVe0cFVdygZijXuZ dxKg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ/r0HQq5xqR902F3JWeWGRjUnUlAX+hsxSbR3C5sspvgWkKJEYjuNR8fcAX/VK3YFa+Kwkx@ilbers.de X-Gm-Message-State: AOJu0Yx/ofI6T+MRGWzz7LrW3DIhCwzgPp0qjyuIRpRqLqv0imuUA4da 4HfSdAkKDfkVhTgTB21CH+YcWIeRD8/tKxp48MdyAytJoWrL3Ak+eei5 X-Received: by 2002:a05:600c:450a:b0:488:a882:b7 with SMTP id 5b1f17b1804b1-488d6ad17e6mr346882345e9.29.1776347689419; Thu, 16 Apr 2026 06:54:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiKoBFTvNLT22B/gXeKw38HYYBNxe1aQsOPvotuXBfRLcA==" Received: by 2002:a05:600c:993:b0:486:fa9e:9310 with SMTP id 5b1f17b1804b1-488f4b15203ls4640605e9.2.-pod-prod-04-eu; Thu, 16 Apr 2026 06:54:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ80YXpQEhuogQmtUMxInO5Mzdl83Xzrs3bJmE1zoD+EtHaDWztZMwqdFha5mlBbdQO+XNBliDiWCGu6@googlegroups.com X-Received: by 2002:a05:600c:c0da:b0:488:caed:5cc7 with SMTP id 5b1f17b1804b1-488d68af041mr312329155e9.15.1776347687203; Thu, 16 Apr 2026 06:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776347687; cv=none; d=google.com; s=arc-20240605; b=CBJqEGtQuH2d870VREM4Nt5bVT3tb9s6OoXPRNqm3cSK6IoWqk0Kj4dJWQIH57UiSz bfvgjFLKPDFL5WU5g18KNU6a44wVSAtZsKs3EFJsNDpo3+X+JRA6XwZADPGkcLL2ziLb DxzZuiDyndlPosIQ1aiXNLN4n3IPQUJAM+0Sh49BCQeMGlou12BfS6f1d7paGoH3Ota5 6S4nQ/hs9zCdM7+1+Njrgn6QG+yI/aZMtSaTnRwgvJPJfvjMLx9CrQgm0eiDGHOGXb9k Ltze6BEalgD+zbFChdWFoJ9Od5rYGbTwbOOhe6JwMIt0+F2mIGQHHzKg7oDJOnbhPH/L 8e9g== 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=5vlymQScwPna5wlJrE1wpfhbgIJ5eQiyuvIZzhXMSx4=; fh=aM+XVJzw2ahpEoNJzMYTk1qqXlaHrvkUStg13X+UaOc=; b=EFuZsk2kjZWeXsJsXdIeQhxr7JdlZtjL4xnFKsl2lHad1J6DSbqyU29NKRAaDNW3kc O0PDx4wwLzPWgk2iDqQLYPjCexWxcVlU9W2YuVFhIX7Pxa7N1P9pSLr0ocGAArAZXwR/ fCo1SYQJ0tK/gkrlCg6HZGZ1dgmR8yt5wy3ep/QLma9lTmcCaKMhHFwSToTpBFppNT60 MCukNyHiO4adN0XVpj8Z/wPeSer3yS/2ktrVOLwQsbgfEe2CLg2ypdpHhCYYiMBT87Bc NH+MddiRzXYGbUZRRAuHUieq7fI7xbbooYHDK+/qEcjM3Ap+uWN7Mw4OgOaBNOqQ9VyE WTiQ==; 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 ffacd0b85a97d-43ead3d8281si85879f8f.5.2026.04.16.06.54.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Apr 2026 06:54:47 -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 63GDskIl031092 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:54:46 +0200 Message-ID: Date: Thu, 16 Apr 2026 15:54:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] prefix DTB files with PN in deploy dir To: Felix Moessbauer , isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com References: <20260410132250.3320171-1-felix.moessbauer@siemens.com> <20260410132250.3320171-3-felix.moessbauer@siemens.com> Content-Language: en-US From: Zhihang Wei In-Reply-To: <20260410132250.3320171-3-felix.moessbauer@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: 4tLb9pKisWf0 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 > +### 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/ac9602f9-2271-4438-b490-686caa514ce7%40ilbers.de.