From patchwork Wed Oct 8 08:55:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4403 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 08 Oct 2025 10:55:28 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5988tRmF006685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Oct 2025 10:55:27 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-3654fd1a668sf32392321fa.2 for ; Wed, 08 Oct 2025 01:55:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1759913722; cv=pass; d=google.com; s=arc-20240605; b=PI8FwP5OwBTFGVWAwmVSGzAw9AcukcPjTERWI25smjUiVgZTaWitrhmd4Es1wk0ZDv kCKWAgeNXAV8N/qDVQHWaQifEZo/CnbA48z+skHR7C0+0K14nIsUWmDT/CefE52DsXd7 59DbyOzExrXf+GHP5h4FtuFYHLNtdGnnjJBmCtklJv2JUmrGQ8578mib3H8ZgM/VH+DM iklhXAJCw39BH5kC11rbtAW5kphXHf0m0yeV5y/9QmtD3tuuzQglZE2YxHMdnQ21PlZ9 3ImhFUS4JQFJ7KDJRv0FuoOqgjNrRKDVYoalLwG3aEEUvVWcTF84uO6Ew0JyKCkPVFqw dHjQ== 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=siMOibvPsSUwLWjSOXj+a/dxYQ69QP7/Gkyl1vDd/QY=; fh=TuywFpl/+0JQ+7wRwT+fy4hH7d7FgZAIRpYjnmRIkLc=; b=LwoPtNw2cO6RNtIK89S6TN3B1D9L4PKzcunK6gaeqWTp8JK37O+XSiKZ2RORwU0uPT KneNJNeB9hQYtsbpye1gEA6bHRh+/Dv4/bRxf3HloTrVU6dlz7FSQzAtfxbhyoCho8bK j4JAwrZm4isazaOMeH3AeRWBrG9iapOif8RCFHeeT3xX0EJz8vU7pBi/4WR5DXTXLcAv xmbVYSKk/3LYfSuS2f667HbPqN9hzOuRvT+Yk1ErI03fDbHTn5Uw6/0d1a51OZPHZsdo JTbJJIPrr9kHsAaraFVBaxwSr+VfOV/evyjZMs4nwoUYAAp2ouD/V3+ywi7RkkUuuuac caqw==; 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=1759913722; x=1760518522; 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=siMOibvPsSUwLWjSOXj+a/dxYQ69QP7/Gkyl1vDd/QY=; b=nAcbIqylQbzuR7wIeaPRcQv6Im7sBiwnZK0N+KSF+JMGyUwy5mqWEMek8/sqY8wvpb P+JzIxnhDhYuhfOLidiRxSj1aC72NIa2kIFSTLGCG/GPWwY344/Tz89HpIyx8p1FAwQJ 5vrtB494JGYnAA220le6E9CykvpdiJwNHReBDt8kOR79BMPnlJyoPMU3koA7rj43iW9C tw9/Lk1fhjJmrpXE2AApI+laJG5bzuZIr5ZFA6B77VqkSVCmXeTfhdcCShK/90Xo4ex8 XJwjl5QzD4+021v8Ia9Rl7Faa8PVHCszwCG8vN6Wx2svzMwPYfte+2AhrTj++1ER9KOQ T7UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759913722; x=1760518522; 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=siMOibvPsSUwLWjSOXj+a/dxYQ69QP7/Gkyl1vDd/QY=; b=v++f4WPRaN38pl+vufOG3XRaJlKPqAowXFbXVJMrxWOgEDKawLSw7rT51EHgDPVig8 nFLxejQKNlYtnIzrThYxfNeyhfNM8rwWe0pMwucbNcohmGBfvotY3TgUD3Jr5/qwyXMp xThS2C09mhqX69SvN1h1ppwHgcs91moGjHX5d5o1/uyy0TWL2ZDtUBey6pXCXCYBSlHl vhcKxNqiQPcs2peyHJzw2khJQguN+lfmtc1HVUp/iAQ1ZLqKW6j8Bb4y3zwOKm3jkqQb lhNvGkYWTBKNaCMzXoweRdJa1lB5+TslofPD71NQ/H5SR5oz8Dxq+GZxujLTZgFu5kfL BDbw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVYjRUa76LmsBHwhULhLrj8sLkqQOr48Ipt7M9YtDdLMBZToDrPwYEr9mF7k/2BBTmdUQ3462k=@isar-build.org X-Gm-Message-State: AOJu0Yy4GzR1e+YoNZqx9BJ7+BPE5oU72+ITWMY3wE6owLkqRJWxjnBQ 0IT9BHhQmpkCee3s+BoSZLN7p+7MLM9kmnRn1nALTomzFrDNEmZIjBdi X-Google-Smtp-Source: AGHT+IE8O/heiuIq4FUptEeOdCTvQfTa+MUhAxywU3cW13pO1jDEZrzodOZ1UzUYfom5BWoAKPx26g== X-Received: by 2002:a05:651c:982:b0:362:95d5:3858 with SMTP id 38308e7fff4ca-37609cf837cmr7581821fa.3.1759913721656; Wed, 08 Oct 2025 01:55:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ARHlJd6ciNOhjxhSGLADTCdms8ZUdoxtJC9DJ9vH1E6npH58+g==" Received: by 2002:a05:651c:3247:10b0:338:4aa:556a with SMTP id 38308e7fff4ca-373b8477196ls2530851fa.0.-pod-prod-01-eu; Wed, 08 Oct 2025 01:55:19 -0700 (PDT) X-Received: by 2002:a2e:b8c1:0:b0:365:6b40:8656 with SMTP id 38308e7fff4ca-37609eb8857mr6690311fa.35.1759913718706; Wed, 08 Oct 2025 01:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1759913718; cv=none; d=google.com; s=arc-20240605; b=WPRvqAkl5KZMBRwEsIiRXXGihE5CdcoHbjMzM5s28IWDkh7GVam1/nFcI390K/Aamp SBKJHZXz3D1BQoVbu8KrIdUkoH6d4qBUA8rca2a6FhDt0/kmi5pYHQlqM1FtaFjVcPDz YYjD3/IO+Sok19LChQni0zz4+cVNZsFz/9SS9c+SCtqmg5K+00yN1V7xQW94UWryiwXR E2YbwW9g3roqn9gFXTFG2/rzmchuqocPY1Qk0MJIehaNNl7iw0UEY9Xf2VBmAyDgjx9n GnM68Mvb9PYFdl/EUs26INZ5tJLjVCvuVh0vDu2P2evueXdmZKlWg6ymQJZtJVR2daVI ODEA== 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=sqg36mr1nG5IQgMm/J6o+HYsn1Y/KiTgp1hgS1jE0yI=; fh=8Xmq4Esf4yw5dI5c5lgvA954EkhyniWG23Mi5phyejA=; b=iKP1/5O82qObf+4J25dbUTV1wrcsu9Bi+4gupehSBDqfheOe2YOgqyVyxREonq1gEL 8A7dkG8xNz3aI6I63PF8XauEurx/K4JgV8GoqCScb+K7lehDusPmSf4yRhSa39LrD5ae ALwJ1sYMEr5owGVDV8HBLEk5qqgdzwLxbHhi+Geb89zXd+uKKsptwUBHveezHd8dyQiY uY27hvxswe/SCgXUrhDK+doc+c8GHdcKcHZ0feAZrN3JvLdz0ZNI8jzvXwFqFuoKHAUZ ssosf/OveIOQzOHifkY6TCO15WSsL57UV7jyIQAzD/0GMIf9ZYfOCpDcdNOeKkItHxyG wxtA==; 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 38308e7fff4ca-375f39814aasi1046651fa.2.2025.10.08.01.55.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Oct 2025 01:55:18 -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 5988tE3q006643 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 Oct 2025 10:55:17 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Ilia Skochilov , Uladzimir Bely , Anton Mikanovich Subject: [PATCH v3 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Wed, 8 Oct 2025 11:55:05 +0300 Message-Id: <20251008085507.1017500-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251008085507.1017500-1-amikan@ilbers.de> References: <20251008085507.1017500-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. Signed-off-by: Ilia Skochilov Signed-off-by: Uladzimir Bely Signed-off-by: Anton Mikanovich --- RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ meta/conf/bitbake.conf | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 2930ade9..0a66955b 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -761,3 +761,18 @@ the following variables in your image recipe. For example, to use German, add: LOCALE_GEN = "de_DE.UTF-8 UTF-8\n" LOCALE_DEFAULT = "de_DE.UTF-8" ``` + +### 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/conf/bitbake.conf b/meta/conf/bitbake.conf index 5ab8ced7..b3ceec44 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}-${KERNEL_NAME}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}"