From patchwork Fri Feb 6 12:27:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4849 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Feb 2026 13:29:30 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f55.google.com (mail-ed1-f55.google.com [209.85.208.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 616CTTYW024644 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 6 Feb 2026 13:29:29 +0100 Received: by mail-ed1-f55.google.com with SMTP id 4fb4d7f45d1cf-6597f439a10sf171493a12.3 for ; Fri, 06 Feb 2026 04:29:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770380964; cv=pass; d=google.com; s=arc-20240605; b=OL04/T8Z2NrK3+9XvGVqWInv7x8tqoZlow1BIWNs6+HLmeK1Hcmmv7pX6Id61nLXOa CY/MBINPJJPpVUyEdocCo3KWKZHyMUN/5C6ujoO+/iJUC9WShJvRraLB53h54yERm2xv QTsJ4nQNyKOiG3eTV0KDS8GSRi4J9d64lAJ9gAQicD/s/xh6qmmLPmpUyn6B5QR94X+m to3cYvQH2JrB/DOrvKPA+b74yU6ud37i/rS2xUP+LxaQeOPzOZ2kzMGyvldEfUdrEJos 4O/S41yAWHW4u1hewAGItA1WIfQ28NnHrgqxrIwXpEGHBvkm1s3gpatQsvCVyTRDZ3kV 3k6Q== 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; fh=Ly9cqz4GucNu8AZIpo/snxv0YlhvGzo6YKjoZO4cCXk=; b=iPYl/7TIUs01Ow6wUepAd1sZNG/fgg7cpm72HHGrgRQTEZ2zpojRUl8sxG5074XX8k WLZdROAYiCbHblB1gQhntDDviHvkasEQXHaM5NjhpgbgAhrA/BilxnLqshJngTIiH2yk PXNOjI/9Q5laOcwjn3r1hVBQxESEZqAQ/v4BwadwEAcjsNUPGwApD11ZfgRsSfk+hAGr ol6vn74bO7r/zBVt+rCVHEBXSIEoBiZzJm9M5LAeZJR76adU81PWIw6fNwv5dYYkQ26K ls/g32uN9pT2sjaCzzZxSR4CzqQTAotQDjR5y2ofIi07xJU7dJodmcKC2ylz3KS3Uoan oeWQ==; 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=20230601; t=1770380964; x=1770985764; 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; b=DXuc+hGPdg8gDEWA5eiYaIEphZTGhNwhtB84Mlrwxsk04Y7PDvWbFFedfnPMegA/Zc 5HEWZo+mCOpjj+9V7bEZ2SADUAI7XwaFkGJAyHCJMdWkp2i+kqlYTJ05G1f4A0Q29hql u5B9xoCv4OJI+xXTDznPJHJUslG+R5ZbDrF/jw/iDAd5Exm960w1ZLkmk+84N7gQJCEq UhJyLz8ZD2eiZ0m7oYvQININx8YiUMv9Fo1kOaX/Ffften+JHtRcG8cXjxyXxpdYxw6b uIa5QVZ4oHinA1lW9hzA8jXYnHPzo6KMCJ6mB2PbmvgnYgL6M8/MbOP0P+2TIk2vzNJA KTqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380964; x=1770985764; 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; b=iDFEMlMgT2RoYy6WpWnd5tyF4f8ZhIplgRJTtxaW1QjgNeDO1bGSyZjkmlgx3p2+1t XnQ5RzLgQolnY7QvJGuXSZxt8HRzFLOuPL2KkxSYdUpBgNtqBKrhkibLtidG6cPq81u9 AlPIYXMOGTblNkzufKgcOcObkdKfVdNXCYti7ldEE0LJBD7pJ1Uqk/nDhPxFnWivd0+R 7blKAwlTzlD0SLGM9pOwkCth2SOoTo2N2Ug9zhwososRUIseDp6xE6sMC8zTOW2mz/IN OsS9wApC52nQOb/Z+xXlp5nWrhO+eKUVaBrRIoAjzAQJqYV0nkTprYvgtL92ovOKyKQj +kgA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV5gRTWgGCdP8hvmvjoGR3cSYRE8r3u/3a5s7mTwpYCs4MPLXMIRq0mnZqyFllhEry51Oo6I2U=@isar-build.org X-Gm-Message-State: AOJu0YxDa9GoRWWGn+u7qFGOFXKWVSJj8cXmTainorEIVKHRdzsP4rMk wd/STJ6je/FQpa6+lQr+gYu9jUjUyymdpravtCq4rmRUPRyBBQfQ7Ro3 X-Received: by 2002:a05:6402:510c:b0:658:e5e5:de73 with SMTP id 4fb4d7f45d1cf-6598411cd9emr695950a12.2.1770380963394; Fri, 06 Feb 2026 04:29:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Gh1VvCEGv3qEArtTc4y6NoLG04wwCGE2xkiefrNKS+Kw==" Received: by 2002:a05:6402:f10:b0:659:495a:85f4 with SMTP id 4fb4d7f45d1cf-659622984c8ls2361504a12.1.-pod-prod-06-eu; Fri, 06 Feb 2026 04:29:21 -0800 (PST) X-Received: by 2002:a05:6402:2709:b0:655:c395:4553 with SMTP id 4fb4d7f45d1cf-6598416868emr1210051a12.23.1770380961265; Fri, 06 Feb 2026 04:29:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770380961; cv=none; d=google.com; s=arc-20240605; b=L2VCIA5xZZA2a2FkLngF5yoRS5hyVZEHLyJqU+gKpNg30BJIXsDqmgy3axitsdRXCZ ewJZZv3z0gjFE1eI+Q2f8GCr3JGJDpsNzC1/fGHL1IliGuxs49MquD8QmnjLlDjJvfbn C0zOJ9+Pz0FfV7IU+hY8oYPuwTGY/+oQBMcpzqfIVrPofM4Oym5TgNAj+MzOink6AONW QJnRGkZmTtyMhB99w/nLjq+dc66miifiAGjHd7W5OSbTJwJjjKtpTU7vnXeguC3po0pL 52/Ej/fTOBYmmrStXVZX++XO9mP+h8OOT2hD0itiTzeQK54St17hU9YaCmMpUJZTcZgp 0O6g== 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=KPbNvbAax+ik6V4KMvLjJKEoo1iTMcgqk0iXs8dh9fk=; fh=TJO83ZPiifPcn/eO1vjaK8KBcIEI9UB4e0WXU1YgcuI=; b=AMdNa+GVK0Er7Bsk3l1h/EmTHrcM0k/3k7TPVbu+h/AdftWn3GZFGFX2FflRoXAfQS TqWztPNLswszdLU7Q8dzgHQMsPNbGk2T0H0LYwGduKpiKy7wcWWuc3qMKcqC8TwAYvtx /riCNprr46L8urwzy3P+Xq/TMaLFYWsqyeSYXt9Umsclos5HtNCCPQaiHoVJMYBbDtou QfAz7y18uRtofMzEHr4YQUrlQeHmIyFbG87HyZvDywmLgtPOwJ/3SLKFkko0hdxkaGBa kr8d+IrNOEFPGjbmqGl6yQYHKcZ0AzDbhkV/Ug0SJ+ZD8l4t3FroXIOyW1fL7HTrsjLk xMxw==; 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 4fb4d7f45d1cf-6598400bad3si44512a12.5.2026.02.06.04.29.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Feb 2026 04:29:21 -0800 (PST) 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 headcrash-nb.. ([81.198.135.230]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 616CTH1N024605 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Feb 2026 13:29:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Ilia Skochilov , Uladzimir Bely , Badrikesh Prusty , Anton Mikanovich Subject: [PATCH v5 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Fri, 6 Feb 2026 14:27:24 +0200 Message-ID: <20260206122910.248334-2-amikan@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206122910.248334-1-amikan@ilbers.de> References: <20260206122910.248334-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?= From: Ilia Skochilov When building different distros with the same machine (e.g., phyboard-mira-bullseye and phyboard-mira-bookworm) it happens that some files with the same name (e.g, DTB files) are deployed to the same location and this causes build error. Use DISTRO- and KERNEL- dependent deploy directory. Also fix paths in installer and testsuite. Signed-off-by: Ilia Skochilov Signed-off-by: Uladzimir Bely Signed-off-by: Badrikesh Prusty Signed-off-by: Anton Mikanovich --- RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ .../classes-recipe/installer-add-rootfs.bbclass | 4 +++- meta/conf/bitbake.conf | 2 +- testsuite/citest.py | 7 ++++--- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0bad8a44..6d7f12b2 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -962,3 +962,18 @@ INSTALLER_UNATTENDED_ABORT_ENABLE = "1" # Optional: set countdown timeout in seconds (default 5) INSTALLER_UNATTENDED_ABORT_TIMEOUT = "5" ``` + +### Change DEPLOY_DIR_IMAGE path + +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}-${KERNEL_NAME}. 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 2fa551bd..b79c2357 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,7 +13,9 @@ 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_KERNEL_NAME ??= "${KERNEL_NAME}" +INSTALLER_TARGET_DEPLOY_DIR_POSTFIX ??= "${@ ('-'+d.getVar('INSTALLER_TARGET_KERNEL_NAME')) if d.getVar('INSTALLER_TARGET_KERNEL_NAME') else ''}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}-${INSTALLER_TARGET_DISTRO}${INSTALLER_TARGET_DEPLOY_DIR_POSTFIX}" 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 0f84e715..ad3d6b53 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}${@ ('-'+d.getVar('KERNEL_NAME')) if d.getVar('KERNEL_NAME') else ''}" 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 f11cd5af..8047c42c 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -496,8 +496,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' @@ -526,7 +527,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