From patchwork Tue Jun 9 08:44:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5117 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jun 2026 10:44:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6598idBC003598 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jun 2026 10:44:39 +0200 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-490b9318944sf36879625e9.1 for ; Tue, 09 Jun 2026 01:44:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780994674; cv=pass; d=google.com; s=arc-20240605; b=N/O5I+KNyfA2vX/gdng5gtuZhRndgT0oItWiJnJufvNWJLOIlTNyOWiOANDXSZXu53 uq39ekdNNfsWpG3bGLAb8ISNsx9eHQV4tHXH6x7xPWScPycDN1FpRb4YVoTpdEzrMi8p +dT7FY2TevIG3rL8C48vvtHWzIDTHv26gR2cFKK0tb7Kxydrq6cy7b55PVz8oJTDeaes ePMaApzT0yNG2v0eAE63J0zA6WPKjNnkyikiCAXZbR99xSxi3FssAsNllw3ExJ+P2oll KbgBjEYAvucoVLYg/7rbSmwbHnsd2jBPWCIbSDH1i/nIsmuzCl83+dGJfJ+EUI0bEO+D Urtg== 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:cc:to:from:sender:dkim-signature; bh=Iv7MHXBxSaPyHFf9z4wmqzX15D8hv5O4HmXLJ1I4H9o=; fh=7uGhWraRmCemz55+jNEhtTIFygPz163CUMJZRBebSRs=; b=cuqiAGufZznZKwCCzMjf6gjFscXtPDZrH1+Ssa4KKSVPi+6aQ63wlgvgTwDkpfHI2D wLl3cKq4onc+cbVS6V/aaLFfbC5lqy2IGoUyz04YTayrpuuNikjDkWNZfSSXbYJEmcRP dKfN72W6uNhK1JjAwMOGmTKKgyOMI83Xl5lSHnWr5Z+GJxz3pKbc65aWv2yaKrTA0nU2 Cb0f8csCDiH/k2jP1aOff6b6HCAOdfeU0wxEgXFkLYdyaoS5SO62AlEZNgy1X/e5t+rD zBqNE3tw3oQeth4QDxNwx7MWG/W0Fg1vTFf4JsClwsCtAsnz6jBzFAtxUW5xWI5L+/Ni QWTQ==; 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=1780994674; x=1781599474; 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:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Iv7MHXBxSaPyHFf9z4wmqzX15D8hv5O4HmXLJ1I4H9o=; b=c5C+c+BSXnV78eY0DGpS9ddkW8vSZSJG4L9FDf0Vm5QdBU3wtBhZ0QG+Bd/o5TGsn6 HJfdDkk0qR6uBfSmXEeLoAL6pMeRcGXEaRgu3ySKoB+i7I7HJWmEBnBwSgEceqhcRc+Y QvE+3k+F9uU/ytGr4hxl5ST6e9XEwdRpv4P6G+4nK4s0NlL/2HOhs7fHgV4yBG3Fcpqf BDc5a4f4PbBCrwNLq36ym3XZi+0HbAPKpL8FBilyZ5fNsNLEV5nKNtX/W5xpG2oHpJeK RJFU/Me5ctrAmGzAzcsIaJTzR+pR4lVfA7I0txQv2vaJ/waIYm/XgN6AsV+TWCWwIwY7 tIPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780994674; x=1781599474; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=Iv7MHXBxSaPyHFf9z4wmqzX15D8hv5O4HmXLJ1I4H9o=; b=Bv2uSx/AYNzTFWiauI4kMFhc2zA1tr7Cb7HJUto2VrzSQKknvV4qb3UBu2mAxF0EFm 4HaFpKY0wSpFZ6u22adL3vOXVeljs+MkZsRhGUWVpvo0/NaR/Vs6AWblsJRdRrBbOIm3 upyxchjdAIC3oJw+uHnZn+rmkiBKt7cZoNKLlNdr6vbjxEhmUjuwjj4yQtfTZo2+6a7X PteOXUiUmvsx80h7T5pLl5UG91QwdQdsubGZ1UKjCZd/1BgkNOUic7RQE5GEN5thMbdv LUx8uzTqi8uKIKxo/cessmTpf+n7FFa8S3G7UbhiTpsfWqw9wkQRXu+XIyyGe0H6TuA/ kijw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ8jJX7twkVmxvwQLx9y0Os5ukXxgp8yWYdypypiYeaq6eKh7DbPsqix6AcoibEKEVmEqi9/ri4=@isar-build.org X-Gm-Message-State: AOJu0YydW8WOUf0WJ5wYCblMTpHXSDPUWO40g+yFO0p4wBtWh7xNz3BH czQdoxtr73Np3hM2630uG3ZoKD1+8qFps8HOMb5M7Jhf0SAWQxOVWndB X-Received: by 2002:a05:600c:3146:b0:490:9df1:f0d5 with SMTP id 5b1f17b1804b1-490d72345dbmr19284775e9.28.1780994673965; Tue, 09 Jun 2026 01:44:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUf9aPX5NhpFWvQV4NoOTyngBY4fvrrzVoL8IYdSQ/N8kQ==" Received: by 2002:a05:600c:3b8f:b0:48f:dc6e:7294 with SMTP id 5b1f17b1804b1-490bc91eb4fls54600855e9.0.-pod-prod-01-eu; Tue, 09 Jun 2026 01:44:32 -0700 (PDT) X-Received: by 2002:a05:600c:620b:b0:490:b9c3:6c48 with SMTP id 5b1f17b1804b1-490d7234fffmr18474485e9.29.1780994672091; Tue, 09 Jun 2026 01:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780994672; cv=none; d=google.com; s=arc-20240605; b=PpasLIwi0halDUMu9B0gLKQr22BulCsX5GXIj/aWw5nCTRAhgpWBWe72t4w/x9TtQN E40tj7pU/JoLIU7l0kankBN4XI9Xi/qKr/T5O5iXJIlNuVVQSiqAp7FgeqQHqIPM5fNC w6+GjyPJM82zCI+ISdmP3pP0cFAJkv650hGr2xL7EDZgFuOBOsznJAxrRPnQEFt1w+PR 48BB3G4a+s98WmxQgOhAReldaZf3WH6pMkf/ZDFjw4GqPOWfNh/m/4dsROVWMaZ3BSk4 9cxfPZT98DpoQymzdmmNAaaxJqkpXrm/8w/9TPs1eFUE/f8fxzLNKNeSpCUJl0mA2xUS uwCQ== 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:cc:to:from; bh=oeuCOTpzQuFv2lx+sJFftN7CfwJlZnopp9sbxbJ8DCg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=XlbRhwwDeiiAqo7lZkWsdPjW2Q2R4ZOCNM/TfPltmJtvNW/Ow1pxkdGnca9a+Abv3C wt4qTnymeZ1MEUQ7NTcUaPtjczlKRZEAoIDMWQ03/C4RmxNBTd7QOY7y+keFO5B6f1qb ZfEyL8EJvQa6uJj0FxFWnYsPK3JDAARgLS4y++OORY1O5xw1S6t7yUh89ZCrMuKCE4vC N0/dIXwbBZUcSgv/djXcUcanXXY8seng6hioWnJLYwMFMWz8WawoSKSr38MPEgHeXMmo /SvbPdn68UMZ9WkWXMJQdWMYg0zQLBhEg5cSV+HJ/i2v2OgWW8+Sp/36BO3d/BQ2K0f1 7YXw==; 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 5b1f17b1804b1-490c2d39ee1si1219515e9.1.2026.06.09.01.44.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jun 2026 01:44:32 -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 6598iTgH003564 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Jun 2026 10:44:31 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v11 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Tue, 9 Jun 2026 11:44:20 +0300 Message-Id: <20260609084422.3948645-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260609084422.3948645-1-amikan@ilbers.de> References: <20260609084422.3948645-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_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: 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): """