From patchwork Fri Jul 3 15:08:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5213 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 03 Jul 2026 17:08:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f56.google.com (mail-ej1-f56.google.com [209.85.218.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 663F8qhU017204 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 3 Jul 2026 17:08:53 +0200 Received: by mail-ej1-f56.google.com with SMTP id a640c23a62f3a-c1212fe7a81sf9947966b.0 for ; Fri, 03 Jul 2026 08:08:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1783091326; cv=pass; d=google.com; s=arc-20260327; b=h6owjpWIiBPQ7Isgv6M5rK/SxcPlzDPrBAyTVbJxzTNVoTj5IUGRkeGFshwJNpL9tx lqptBvpCyj3d3p/EvA3dl2JuXb97xpvyOxd7huctgQ5A5uXqvg1IvJysj3Eo3v0c/lw/ Iubt6lI5tzWYFmt4ktnervOHQ6Oy2n+DocVS93nfB3tz1dXhH1XfJ3q3WYkeOlLqXhmX oa3l40+JeoU8YeU9s3XPjooRjd/ZX35LbVnbOQpWIUXWvgfpLdXjrb8yl5odXlhNht4i yAQktbyiLC89ql/c1xGJGwZdVCR7fdcheoY8J/2c8jU/Zac5v8VrbUpBlBppO/En3soi 7Skg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=XkzbVPKdAobeywKbAI9y10toJzsWTmr84gT+Km5OSuU=; fh=eQ7TvQ8IfbWt0I0QUk1AJrqFyhuu+WVa+mSawXRMTjA=; b=bBbho+WImUQFiZLWR2pEtrIEE/aJVezwGpkbucaQU8ozr/UAu4XHHDrJGGU6nnGUGT qVLkUEhDcqCR2dclztlfn1rPdJhsHxGzeOwTbowpDRSF0Ey0lrNUsZeg3YIruMkiHFuT ZBQg6o+uGJfwFhXr/0oimgX2OKixX7BLj2/G3qDqunWBYaSCW55Ys3vTMoACJbLUazbF QnyPeE9TfTDjZmcRG61TFb58rPL16T0LEHCd4EXPSfTiGwnWyJrs0tqbD82j3vqlqeFv AU8K1DtSpBmsIj1pJnbYpTMuR4AjcPF8HzaC4+/YbWsiGHcJoh3dv+TSvUbKm8aXc9RD kPag==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1783091326; x=1783696126; 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 :references:in-reply-to:message-id:date:subject:cc:to:from:sender :from:to:cc:subject:date:message-id:reply-to:content-type; bh=XkzbVPKdAobeywKbAI9y10toJzsWTmr84gT+Km5OSuU=; b=H+VCzVuNNStWkzFBq2GqLAm6l4KZM22sJxQNyEBFiLe/lW1G/UdenjOAkqgpFTGbcj MsNlHBbxjVSo5OveOPp/F2jwP3h09aHlhpZR0n09ilBUNxV+ER9WYJB1RA1N95AHz0Av zsFR+0VVn7lJY0pwCsZza3I1bLbyI1A5LsvbNYT8j79aTSOcsoFg28B2+h8FxmnkHWfA vqpaJaiFe+S3l37ABkVG+jTnJzy1KECxkauJxLoUzEgONeRxnE92RJfC3JJ2LwSl9CGP NNWnfXuc5sycWD5lv++Fdhiyhy8HKCF38laUsBkwLhByXxtiWNUXoRTlJ+zoxnoIowNz rkqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783091326; x=1783696126; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XkzbVPKdAobeywKbAI9y10toJzsWTmr84gT+Km5OSuU=; b=hzCp7qr9xKfOF+oQmyPj19+ay01j/Q6Tz4gX/ZYIwCpowT7UdWTUBOVio+NU9t5l++ ABQ3QqgVmDMKZ0PNYV7rGMd3dwRg/hUSqEI7A/p22mSeSie6Z6YRc58l6bw1m+TZafJq 0tqJxOwWmVcKjB8t2dwd3BA2J9E9dORhF2ow+4oR+4YhpjyDGL6/VKomlH3XrY/KJpel /t590UynvMSHc6R3fxOAY4ohUvgo9VHa3ywqMhRc4+EN6b7RBiQjRX5GTSnjS6hhlNhg bxVwLhH6yW/bZoN+EXfgI97shP9iHfso8VY/McrqYBMdXSNveZMog2U5ihS7zfGDukc5 XVWw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+Rr+K2uWIBr6U2hZ2uErl4FQBTtvE23Sz/B287c+XjM+E0kTzM3VIK+ZToxY3Vw1Q8XvLNYSaXg=@isar-build.org X-Gm-Message-State: AOJu0Yx+K08IxqdAwDjybxuuqU5f4m+sfkkK621pNhpSMEvP0Z510Bo9 e6t9+lE1mdGlqJzDTWcbTa0J+ievMvYWNRpl7YERpsOAs41BbvXPGTKS X-Received: by 2002:a05:6402:3908:b0:699:6415:751e with SMTP id 4fb4d7f45d1cf-69a175c5af8mr48408a12.4.1783091326387; Fri, 03 Jul 2026 08:08:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUee5HmVJBtSXxKs+kg9rB1p154WyP4D2ysaOt640MnOvw==" Received: by 2002:a05:6402:321a:b0:698:599e:a7d7 with SMTP id 4fb4d7f45d1cf-6989b1c50bfls3574022a12.1.-pod-prod-04-eu; Fri, 03 Jul 2026 08:08:44 -0700 (PDT) X-Received: by 2002:a17:907:8997:b0:c12:13cd:9579 with SMTP id a640c23a62f3a-c12e3cdbe1amr8299466b.0.1783091324407; Fri, 03 Jul 2026 08:08:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1783091324; cv=none; d=google.com; s=arc-20260327; b=FXgkBQM9gq4D7r5GOyW1a/FXs+XnqeVjai8SKLGwEFh54du2Vr67pSerDERBCId1or +IdIMdhPnUUbZrcpxNoBlh68tQhRXuSVV7KEuQWlKJPU++mo+Oioqs+6hJ78lXa6G/am 87ivx6eTrUSJwSkP+FuW7Ek7xs6nRWXnoiZdtLccBVbmVBuV8wEqhx0MDA4OFR7TYADx YYwfdVokfCkGzxMTiG+fZiRfkQHOuiNf7q4h7aBHKGd0FXrT8E8GzSed2VE79d2F3cVT Lrq4VJSrriZOL6Nv/2APPtZhmoGkwwUFBKwGZcgxXi3lLRIlnugj371BTQL0x0L0qei7 jxSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=oeuCOTpzQuFv2lx+sJFftN7CfwJlZnopp9sbxbJ8DCg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=qAdJrrWYXTiJ8NYgj1CX03vmrhS37/dZT13NyxhBbqMf+u+1Z2s/vDBTpqdfma10U0 IGTGUK8bP5fo2Ql0JdDuLFHmLqTfC1Ah6ETpSt4iwOOu/jBCfi8SQmfxIsMdDyO/gAab 1TRspOmefVzgTpOo1z11Ruk0iwucnsiq6XtA2rOUghaUDfUTqE4NrVAQ7cZZODnNcXcy rde7BFIlUHySZhSnbdD409yD9X88Cp/vW9tU5ucKXSFlBLkhIysYfYanBwqnkQEkkAAs EIS2jPGd+mYJfUir9RhDmacaOAR3lbmxa3SjLsbCaUDFAql1mE8ecdOgrs6V1c5YSO+n 81lA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a640c23a62f3a-c12b5afbcd1si10515966b.0.2026.07.03.08.08.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Jul 2026 08:08:44 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 663F8gDS017164 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Jul 2026 17:08:43 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v12 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Fri, 3 Jul 2026 18:08:33 +0300 Message-Id: <20260703150835.2490688-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260703150835.2490688-1-amikan@ilbers.de> References: <20260703150835.2490688-1-amikan@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_H3, RCVD_IN_MSPIKE_WL,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: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@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?= When building different distros for the same machine (e.g., phyboard-mira-bullseye and phyboard-mira-bookworm), files with the same name (e.g, DTB files) might be deployed to the same location and this causes a build error. Use DISTRO-dependent deploy directory as a fix. Also fix paths in installer and testsuite. Fixes test_dtb_deploy_distros testcase: ERROR: mc:phyboard-mira-bookworm:isar-image-base-1.0-r0 do_copy_boot_files: The recipe isar-image-base is trying to install files into a shared area when those files already exist. Those files and their manifest location are: NOTE: recipe isar-image-base-1.0-r0: task do_copy_boot_files: Failed build/tmp/deploy/images/phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb (not matched to any task) Please verify which recipe should provide the above files. Signed-off-by: Anton Mikanovich --- RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ .../classes-recipe/installer-add-rootfs.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- testsuite/citest.py | 12 +++++------- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 5d2514c0..a6ded089 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -1087,3 +1087,18 @@ and `arch=all` binary packages). Recipes for such mixed packages should append `PROVIDES="foo-doc-archall"` for an `arch=all` binary package `foo-doc`). Consumers can then simply reference the package by its original name (e.g., `foo-doc`). + +### Change DEPLOY_DIR_IMAGE path + +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}. When building different distros +with the same machine the following error occurs: + +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. + +To prevent this new path is separated also by distro and kernel values. + +This change will influence on build artifacts location and should be taken +into account by downstreams. diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass index 111506df..22c23879 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,7 +13,7 @@ INSTALLER_TARGET_IMAGES ??= "${INSTALLER_TARGET_IMAGE}" INSTALLER_TARGET_MC ??= "installer-target" INSTALLER_TARGET_DISTRO ??= "${DISTRO}" INSTALLER_TARGET_MACHINE ??= "${MACHINE}" -INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}-${INSTALLER_TARGET_DISTRO}" IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6db10eb3..8134c10c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -57,7 +57,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 250c01c6..7d666880 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -522,8 +522,9 @@ class InitRdBaseTest(CIBaseTest): super().init() self.deploy_dir = os.path.join(self.build_dir, 'tmp', 'deploy') - def deploy_dir_image(self, machine): - return os.path.join(self.deploy_dir, 'images', machine) + def deploy_dir_image(self, mc, image): + multiconfig = f"{mc}:{image}" + return CIUtils.getVars('DEPLOY_DIR_IMAGE', target=multiconfig) def dracut_in_image(self, targets): machine = 'qemuamd64' @@ -555,7 +556,7 @@ class InitRdBaseTest(CIBaseTest): bb_should_fail=False): mc = f'mc:{machine}-{distro.removeprefix("debian-")}' initrd_image = f'{initrd}-{distro}-{machine}-initrd.img' - initrd_path = os.path.join(self.deploy_dir_image(machine), initrd_image) + initrd_path = os.path.join(self.deploy_dir_image(mc, initrd), initrd_image) # cleansstate if the initrd image was already built/deployed to verify # that a new build does result in the image being deployed @@ -725,10 +726,7 @@ class DtbDeployTest(CIBaseTest): self.init() self.move_in_build_dir('tmp', 'tmp_before_dtbdeploy') - try: - self.perform_build_test(targets, image_install='') - except exceptions.TestFail: - self.cancel('KFAIL') + self.perform_build_test(targets, image_install='') def test_dtb_deploy_images(self): """