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}" From patchwork Wed Oct 8 08:55:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4402 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-ed1-f59.google.com (mail-ed1-f59.google.com [209.85.208.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5988tRlg006683 (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-ed1-f59.google.com with SMTP id 4fb4d7f45d1cf-634779072f7sf7376486a12.3 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=PsQZs2a1XcR9l+tG9hQPwzuT2avavprRIX9WBIwfBCHdPcQLD3VxzoaTzDylrF41Wb wSnsBpzOt5p3AHSCisDiOC8ai574U+go4hO1v7trwyzv2OwXLZKi8FOeF0bGNqEhRZbR 20ErynJK03bL7gKzrNS+KoDs74BxzXEKsxYws5WbZFRGQumk292KqgaSIGgBI2YjV8Qe nFz7pF48IwLqHd+ZAHbJ2y3lvVhyCHKDSYqcyFUjW9gLOVnscrcuiLpxVL76A0KkOjTf ZyPt7hsNERCuVnQfdtk9D2O0Klzqm3Wh6/2fl8sD3njHWOE6xcmX69kQQWXEQsgtn2uK oaMg== 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=Y/T4VN1E0nuHmXEinNH7aoI+tFkK5vEzyYq1CApWw4U=; fh=4yU5PCx7wDkGe2qHO0ITGRFXqcsrboAfl7pyTcEWTuY=; b=k9QQfa255aXrpqIUuza0QQPOnplePL6DdkpBvqPN8mz4mU1XefpTWflahXEMOHc7C7 1OyFRsZ84ortflWJnU2rQ9s59Ol9iJIvFPabrmOzm9VryTkY/qYTYxWLvEDbpEiVhUFK ExDdPN7nQlOSKQrIzN+7SpVSaHhZyntFU0QsZaFTcQic+40ij5Ye2SV7N6gIrWNiUido +uiJE8PQcwnmLeD1QkX5v4IbzN7LEKy82t6+ZMBPtOwOjDM41cWzYBiCyv0PXbqYc7j4 gMRFC5gQFojbtMzj9WWuwrycEuI2A2RcMVN6JLzsfVToPMPdx+NNqa5BWtBczlucZ4v4 qRtA==; 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=Y/T4VN1E0nuHmXEinNH7aoI+tFkK5vEzyYq1CApWw4U=; b=IjeTI/GLgnZNvjhcIEls4vITSC6gpUBP+oPkVSIL1DPxGd6Bj/iaxus9jsgVCTPM37 yweEuCfNy4vm09XF4asJ5UnroOfNYQPFcwDbDJ2lvosT3kqQjaqdMVxX1FzvX1Em/H8y tJCCqtcr7E14fAjEwtSkwtUT7lJiIPkGUoqfCsbFL6M82tq1CiLH3zgNwB7DMCxWQOTc ItmpSH5NmKAK4YlUXNZVnyPcr/cPOjmTkqOufShuHdyJOvIOFagHKL5hH5RUXmR6Ezlj Tb+7Lc10Vlgyi+Ay0FzWZ69feGzh0cyDR+vODLqZpM+HBjmPdACMb9NQkZlA2xqKN5LU d6QA== 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=Y/T4VN1E0nuHmXEinNH7aoI+tFkK5vEzyYq1CApWw4U=; b=umgAlwPqaXRQ8BkVuQhXE9SJjRp6bM4TKZa5m+LeWiPDZDFBBIoKKQZvmJpWd4mmBW iJ9qCzDVDPs5XEq/HqyPDjooDXOOQnJxTTB9iXAl8SAueTlEzQf1CW0wP+MGz1yi4LKX DXDI+f/IYb7pOP2QYgV1SBz6OSBZbbbMSr1dl85CEu+omNfh66C0NYAk1T/fYNbdeO3s LDnvoVbtwpGAVYDtbgx5lwnmudAIWczOyFVT/+UHS6V3mHsqf1xPIKgMbJBZ2gBSDiQP UDA+7IDl/2eGoQQpgsln+kbMwalVo9DrIhRydp3aw7WgKiw4vl6G9Rzr12ajqVKaW4Bd Gmgg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXW1k6inbJfovOYipKa0sc1TSlowN+06RPWp4KMVJpwCFdf2pTnu9mNqNo6eGJ1vPV4j1R2Hkc=@isar-build.org X-Gm-Message-State: AOJu0YyRO1PrUPI+nsg3bKpAzCn7KCN/RtE+rlGNcz8iARCErY8SHxTS Cu11MxsCNUDaawm0kXjpbt6klOwGh8C2uyhA5hkbDrizawCW9IaFZPd/ X-Google-Smtp-Source: AGHT+IEyc00OpDFCRRq+yI8S4UOfOcVxF3xKM8Y8aSR0P/Bx528g4tJq8t9b/dA19N+sQGdNsOMLhg== X-Received: by 2002:a05:6402:3511:b0:636:f3b9:a4f9 with SMTP id 4fb4d7f45d1cf-639d5b57addmr2119098a12.2.1759913721593; Wed, 08 Oct 2025 01:55:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ARHlJd7zVoqnAVTudJ2o98JrNyshOj5xj5lywgCCu+WsqHlzaw==" Received: by 2002:a05:6402:64d:b0:62e:ff96:97d6 with SMTP id 4fb4d7f45d1cf-6376a8d5043ls6402502a12.0.-pod-prod-05-eu; Wed, 08 Oct 2025 01:55:19 -0700 (PDT) X-Received: by 2002:a17:906:6a28:b0:b3e:8252:cd54 with SMTP id a640c23a62f3a-b50ac2cf465mr313268466b.32.1759913719027; Wed, 08 Oct 2025 01:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1759913719; cv=none; d=google.com; s=arc-20240605; b=Eg0k9GkwtGMfqSBK9IdeO6vtyMaAKeA3/qDWxrmbOfk2wrawwUXMlz79poRDZnB8hP Lsljxcjyu6ajAg8z1oc/X7DFforhzScC6ZeMC/dkmIWQmo5vT9Eapu9K4GOYoa4h+7ZY OX7Ae64qUcDrFiZtsQ/yQoxJqWt3Nnm5SBoLcJ9ZUjzrh/9nR42fUL6s2XLbw5kWjDrL ZKmH5QFb93hWNDQUw4PuB1akO3BcRgRZEUX03uVrGHv32EY57rSNs/Hfh25BSFGTqH7I 7F3wbD1eN3WTt78AqwgKG0HFWOwezrmii1jySl5EO+YDeGKSCA4pskQEWs4pLlIkVt11 fgdQ== 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=/bwjU+x7DwSi2t/IePRLmJ+DSa2wZwhHSNXlkOWVr+A=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=QvjrfITTzuG40s9jJ1lc9k1ozQHjzKzLFho/r82CCAMYECH3jlOJCpra73kGKGy2Wc E6rf64aT2NaVomZ7YGgxKzuDUIl/pGCw8sWEitdYwaV0piqbh+WgXcsrUmJJ7h0kRRMy uUPzEQdm5aFPOQfC+3WoOpv5VfrcC+uPK8TIJ5kRPEppX3uNg82LvvRtqW97wfV70NcS UDGZQauzvQDP/OfixV8x8NNcy5Qay7HAtla05STrzesnS0m4r4Sby2yyMRcPfMMdHaYz wIM244Mt5IAkcXBNLfRuTJ7z72sNSGt93oB3EIwDEVHnggB9HJUThY//CF7TrxhuyX1m tD/Q==; 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-b50a0cc5b80si4949066b.0.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 5988tE3r006643 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 Oct 2025 10:55:18 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 2/3] testsuite: Add test to check dtb deployment Date: Wed, 8 Oct 2025 11:55:06 +0300 Message-Id: <20251008085507.1017500-3-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?= Build several images in parallel to catch all possible conflicts between deployed DTB files: - Same distro/machine, different images. - Same machine, different distros. Signed-off-by: Anton Mikanovich --- testsuite/citest.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/testsuite/citest.py b/testsuite/citest.py index c99b2fb3..1f1de225 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -277,6 +277,29 @@ class WicTest(CIBaseTest): ) +class DtbDeployTest(CIBaseTest): + + """ + Build some targets potentially causing DTB deploy issues. + Cover cases: + - Same machine, different distros + - Same machine/distro, different images + + :avocado: tags=dtbdeploy,full + """ + + def test_dtb_deploy(self): + targets = [ + 'mc:phyboard-mira-bullseye:isar-image-base', + 'mc:phyboard-mira-bullseye:isar-image-ci', + 'mc:phyboard-mira-bookworm:isar-image-base', + 'mc:phyboard-mira-bookworm:isar-image-ci', + ] + + self.init() + self.perform_build_test(targets) + + class NoCrossTest(CIBaseTest): """ From patchwork Wed Oct 8 08:55:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4404 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:30 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f59.google.com (mail-wr1-f59.google.com [209.85.221.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5988tTMJ006705 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Oct 2025 10:55:29 +0200 Received: by mail-wr1-f59.google.com with SMTP id ffacd0b85a97d-4256fae4b46sf2544477f8f.0 for ; Wed, 08 Oct 2025 01:55:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1759913723; cv=pass; d=google.com; s=arc-20240605; b=BTjbR7aipUbFBVVcfStbkku0gLZtBMqQtpO3BVg7w3jh9YVNKtDFzHXww0eYpEw/5t z91CCaBVt5nE/4o4MPRaAhDP0BIFf7Ayt26nURDq141GWZJHRXGkvUtO+wAA5G9dyKuG 4fPs02BJqRNc1RShQpKlQvJwQ8k8vwDUG0gmzcAR+P/bxCLIESNHq7c8AgRw2oD12WUm jeCXgKWH1eUHorxrpp/dXV5wllAEgCTL5EQCENvHTssWHDLnMQY0ezhmndVTDvdn7EiR m/NcgW0KI/MxcEDHthc8kUKC99wqzG9FtDIIXbOu/fdUNtm0Gb688XTCVu2dzrgQNQvv PahA== 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=Ww9Y7MM8SN8t4F4H+8NEC4Tw5rj1/bL/sHSusgrhkYg=; fh=rV/+8gyZPcFEhNqwciWQj+KbgpYiM/4P5w/PkedX1rE=; b=H86fd8Jofm/N7GQ3XcMkkziWcM7M58ZfEr2aOnRFQg/WDO2/eKFypO1oDx8Msodvkg 6fRZdYHs7i1OlcSt2QBH727rjGiuawI8bWZampBRG70/Z76VcRtUUCbnLge5NHw4aXXm pYzgPhVNtZyyw0bIB9FyVS0WancZ5ToySJYj21eKM1p4cesoJDpFtsmt8sx4XqVqJOc0 sCLTDY4mp/PuzVTUqCpXaDrTnCpG/MtT/23vlJ5YUpRsJHeFWS9vDfy68dJdlfNHyO6k t6F5hab/ZhJfUDMkdfMIIVpiuJtskgPjmhxskXSUAeB2cWlMglSLguRdvJEF+Ri2xzyp F3+A==; 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=1759913723; x=1760518523; 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=Ww9Y7MM8SN8t4F4H+8NEC4Tw5rj1/bL/sHSusgrhkYg=; b=Jgmi+7IY7j0dAYJGSWLE8fBV23xapJTgnV1HhRFBM4CLusVL8eZUcFQEVdRrML59wh 20WWjFR68pnJvEKpW8pDnW7+m/pLrz6v8WpCENsJ3HEUJxlFZaHtJ9pVIbXzI4W1tCGx 9JajfrC2hAf6/yP+hn4TqDc0+WMombVconv0vYOcDEkaVBzsTORLz7Elh75UvcKIPbT+ kcgUPK1tpEQkGyIFjdvIPgg6lxEsnaNpd7GhGgZXIqAp8NyRS2Mp+a/TwEiafyvMZExe pS619DKA1a1drWb9GCJSgC4XPI9MQoMjogxEXYLpfIS8yBGUP7pzZCim8kKD+u02O3FD 1nLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759913723; x=1760518523; 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=Ww9Y7MM8SN8t4F4H+8NEC4Tw5rj1/bL/sHSusgrhkYg=; b=j4fqG97exExUe+0T7yuPfTuzxGxb7jFSekfm1SlJ7SK0TX9+VvYYsQP5QTTx7Oxoo+ g9yeNOAaJHt30l20V9qC3wQhwUrj9TgYBad/VMCf5VKjcyASV1LYzOPMymVKnWPxxYmZ Mw+US1f/xIAk+AGy1rNbT2tp6BcRdma9+TIj7K4Rj6IsDkw6tSQ+C1yc46G3Tz6MLk7p VZDFAOdR+rzEWAKa59Cd+cobxzxzjWP4HODgt6VV8twjdQkpk87vIXPDREahU9Bksf0c cJ+tU20ztPOM+wNXvWgvlY9oyKXJ17i1F89ShPtzpvOIwb+ic/vP1hTuZUqbxaFRA+GZ 8bMg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVazpwqR6g0wMI/DEKQkirdynBSFpdG+Zq0FmbAKvbdz+GRMBoiaCjv88w/UR/9m0htQsvkLbc=@isar-build.org X-Gm-Message-State: AOJu0YzPBnzorYmcPVYZDGAYP7faQ2JSXbdeqWe20nW845zCXhYwI82m 8hOs1aeqgtqm0gVxvoEnQ3VS1/D6N9PRlWyeDoF8IH5IHoraNEAzJFkp X-Google-Smtp-Source: AGHT+IER4pp6d/dBRq9ESYPjfPW1KIEjwjPaQDKEyAmldqE5rrxttlanz5J2RtxEf+OOODtOh/SHoQ== X-Received: by 2002:a5d:5d85:0:b0:3eb:5245:7c1f with SMTP id ffacd0b85a97d-42666ac46ffmr1271018f8f.2.1759913723340; Wed, 08 Oct 2025 01:55:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ARHlJd6MDX8kDhCVyEgZny7garDDZBqAgckufi0EiNgAucGHbw==" Received: by 2002:a05:6000:2b06:b0:3cc:7f5a:b383 with SMTP id ffacd0b85a97d-4255d29aea8ls1848750f8f.0.-pod-prod-09-eu; Wed, 08 Oct 2025 01:55:20 -0700 (PDT) X-Received: by 2002:a05:6000:26c9:b0:425:74e1:25f7 with SMTP id ffacd0b85a97d-4266e8e6d0amr1421663f8f.62.1759913719875; Wed, 08 Oct 2025 01:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1759913719; cv=none; d=google.com; s=arc-20240605; b=OsVe7od5DwL72pxl9oYLdHGVMdlkA0Ej/fGjDi3RJ9LHSZbR+2v4RHidtSL3GX9nmB eI4LyXVTHZ+WuwzoggtnEetCNbzrczApniFmIlvWGt/jCUsj6WCO3vGoMfI+DYKYXbmn Je2c5GAqLevBMQZu2/x9qebUefIblWZ4KQkRU1Ts4b0UekfIiQBYzRiU7bFROneOBWOK jNhpD7PLXg319xUuu7qN63MJmRK5vvfuUGDt2lN4ASOSntQfarcEhjCV0BXlN4Kx2r/Q oysc2zWU05ICQN1XqFXPJ124fgHDZtRBL9GW0kB+bL5fP9a0AcdTisVtYH/tyHEqvJ1v MSwg== 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=p4EBgPVrqQC8IuwVrvCvYdimMFBLnstdueQkqQCh0Bg=; fh=403AV4hwEHWB4lTYzGdOyLsp6fLjI4P6I+0rnADDAes=; b=MpS+Bk00EsaKYzX6nzWk7E3IvtXGB4Sr9JuaS5TNU16JyyK/3k0LBFqFzu0Q1xVvzg eJl8ZMOHmuCR89o20UjGhjRUpn0PtXub6BahHFaZXH3wbHDd7ZPqwabGC5YY3oPLofjn pMtZADBd5m9S5OBJ0u3m/M8cLbRLMilX6uJFf3QqBL7Mq2aqbSyz0oD0dATlWka/TzBv XA0zQ+P3GAUU9emYOGwKBNE+eVAOtgE9ZLt0AstgoeE6+jOIpVlBmVQmyYU85W7UwtUC oYRqJeqdgtp1WXZsOIvunhQXcBDONylFUomI7viqnMjEltO+N5tsQIAxNuepU4tr6d2A QYgQ==; 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 ffacd0b85a97d-42583aa632dsi94034f8f.5.2025.10.08.01.55.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Oct 2025 01:55:19 -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 5988tE3s006643 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 Oct 2025 10:55:19 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v3 3/3] meta: Move DTB deployment to a separate dtb-files recipe Date: Wed, 8 Oct 2025 11:55:07 +0300 Message-Id: <20251008085507.1017500-4-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: Uladzimir Bely Task do_copy_boot_files was deploying DTB files into the same location for different images (e.g. -base or -debug). This causes build issue. Introduce `dtb-files` recipe responsible for the extraction of DTBs from linux-image package (distro or self-built) and their deployment. Different images for the same machine now depend on this recipe and shouldn't cause parallel execution issues. Signed-off-by: Uladzimir Bely Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 15 +++----- meta/recipes-kernel/dtb-files/dtb-files.bb | 41 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-kernel/dtb-files/dtb-files.bb diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index bd1b8552..7cb9b9c9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -335,6 +335,11 @@ 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]}" +python() { + if d.getVar('DTB_FILES'): + d.appendVarFlag("do_copy_boot_files", "depends", "dtb-files-${MACHINE}:do_deploy") +} + do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" @@ -348,16 +353,6 @@ do_copy_boot_files() { sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi - for file in ${DTB_FILES}; do - dtb="$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ - -iwholename '*linux-image-*/'${file} | head -1)" - - if [ -z "$dtb" -o ! -e "$dtb" ]; then - die "${file} not found" - fi - - cp -f "$dtb" "${DEPLOYDIR}/" - done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/recipes-kernel/dtb-files/dtb-files.bb b/meta/recipes-kernel/dtb-files/dtb-files.bb new file mode 100644 index 00000000..f64b4845 --- /dev/null +++ b/meta/recipes-kernel/dtb-files/dtb-files.bb @@ -0,0 +1,41 @@ +# This software is a part of Isar. +# Copyright (C) ilbers GmbH, 2025 +# +# SPDX-License-Identifier: MIT + +inherit dpkg-raw + +PN:append = "-${MACHINE}" + +KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" + +DEPENDS = "${KERNEL_IMAGE_PKG}" +DEBIAN_BUILD_DEPENDS = "${KERNEL_IMAGE_PKG}" + +DPKG_ARCH = "${PACKAGE_ARCH}" + +do_prepare_build:append() { + for dtb in ${DTB_FILES}; do + dir=debian/${PN}/usr/lib/${PN}/$(dirname ${dtb}) + cat <> ${S}/debian/rules + mkdir -p ${dir} + find /usr/lib/linux-image* -path "*${dtb}" -print -exec cp {} ${dir} \; +EOF + done +} + +DTB_PACKAGE ??= "${PN}_${CHANGELOG_V}_${DISTRO_ARCH}.deb" + +do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" +do_deploy[cleandirs] = "${WORKDIR}/deploy" +do_deploy() { + dpkg --fsys-tarfile ${WORKDIR}/${DTB_PACKAGE} | \ + tar --wildcards --extract --directory ${WORKDIR}/deploy ./usr/lib/${PN} + for dtb in ${DTB_FILES}; do + mkdir -p ${DEPLOY_DIR_IMAGE}/$(dirname ${dtb}) + find ${WORKDIR}/deploy/usr/lib/${PN} -path "*${dtb}" -print \ + -exec cp {} ${DEPLOY_DIR_IMAGE}/${dtb} \; + done +} + +addtask deploy before do_deploy_deb after do_dpkg_build