From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jul 2024 17:06:59 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f56.google.com (mail-qv1-f56.google.com [209.85.219.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46CF6wNb024074 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 17:06:58 +0200 Received: by mail-qv1-f56.google.com with SMTP id 6a1803df08f44-6b5db3c9334sf27991806d6.0 for ; Fri, 12 Jul 2024 08:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720796812; x=1721401612; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-sender:mime-version :subject:references:in-reply-to:message-id:to:from:date:sender:from :to:cc:subject:date:message-id:reply-to; bh=vmmkDbFrNJ8kHF70fwRDYbIRRKyzJZ1IN8WYFQFk/a0=; b=ci+1Nz0fKR0ilDedMzZia1iPt9MLlvJGZjVbowTVKLvha3DD63VasEAI1EQYs88PJl 3JZgw9mNaqXlTI11/OBYNg2rxcFZhn7TkhVe7zX6g+ZrLMyOs0ADIHXU3hK0PFoLDQrq EGl8i99IU8mj4qNML8rZz5pR9TUO+WqZwk4zkm/9mVzXWowIBqwBbiuW9cm2S37CmOqc gLSwJzqKO0kDmMOyFeeAtAKBZyvHRDl3xvykT+ui7A0CokHBtM1CZgWkH5fb5ODzBcTT 4VeRQl9nL8y8MWbkNXdUixf5BOg2VMDqlgsN/30NFd+pt0jzmGaJOHVzeMjFAjYB1KdI h0AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720796812; x=1721401612; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-sender:mime-version :subject:references:in-reply-to:message-id:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=vmmkDbFrNJ8kHF70fwRDYbIRRKyzJZ1IN8WYFQFk/a0=; b=FFqcSRcoOk3luI6v76ridDgZusyT+/yQULtwQ6yl5lFWBRuaNXz0LWJ7b9TMK/VY9c Bmu0oE1pTuTT/CkLEGJ9vDUEqV6idIXiOScvdXfJoa3hVONGBX0H+xxHbUpODR63xUF4 y2Nu/GsrsADqUfN2NWOwECdcTOGJzOzsIGqYYwBR1YM3/IyPwcFgtpYdLBelMDQpGlKy utm48/RIo6GnPCqEFQE/5McfTdCHRuuCy9jPKPKgWsXKrHE7hhuWT7XtW2m2Paon+7bE fowkTLXNULhaCdHXHX5L0ZBT5P72WvSBlKgrDgdyKBo0O3ALPP6oJ/oAJwIUsdfIphyO nvPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720796812; x=1721401612; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-sender:mime-version:subject:references:in-reply-to :message-id:to:from:date:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=vmmkDbFrNJ8kHF70fwRDYbIRRKyzJZ1IN8WYFQFk/a0=; b=OmuBwyUrtdG9LkT5A0w656JeqV9YPVpiVi+4hAbn1cae+GGGVoA97r1ya8TcfNcbaS VSGqCJ5Vg/lQeSsKhXXxGTOK345eSK03SDpgxupLE0ZWnYS7R/83An6XwB9xcWzltdpU MP/aKndEZMPJJLjxcwQYiRnrGWNdPeAtAQKGcVrGabp5xzrA0o9JeaeQUW/otG97qgwp UtmZnv8QSeitK2feHim3f72M34Db5S1Dt1pPS8EumDi/s/LmxwDZUbhO6lUOYP/17xaa IJKRCdzDUec6n7gjPM11O0nQYAIXPSTHlTPXZjvmgq5/06Grqi/Mcvz8S7wHTcgv+uhx kFgg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=1; AJvYcCWQdWi8hjUWKKhtFPJwVj1DzfN4m1kROPMqo02CCuxSi0Hklzv3CHOVpZzfp+Py4L3nofOTaSW5zBwuVYscesF2i0k= X-Gm-Message-State: AOJu0Yxv9YNY0CrnD2ISuuomDqwsdoorBYsIG5UbkG/t/sRpVwrhA+e7 1m836iTsbbpgkBv/0iacULdKhFDz/mLx459vBO6hapoK021knw0+ X-Google-Smtp-Source: AGHT+IEN4i2Yo86gXByEddHOPXM5Inqyd5qzsGzV0UKgk6j7Lh2Q5oNERJ9JKtyPhiQQO3eGlkAoeQ== X-Received: by 2002:a05:6214:2a84:b0:6b5:e933:6905 with SMTP id 6a1803df08f44-6b61bf51dc1mr138110466d6.37.1720796812200; Fri, 12 Jul 2024 08:06:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:2b0a:b0:6b5:f4e:9d67 with SMTP id 6a1803df08f44-6b74b326793ls38099866d6.0.-pod-prod-05-us; Fri, 12 Jul 2024 08:06:51 -0700 (PDT) X-Received: by 2002:a05:6214:5197:b0:6b5:dfc2:669b with SMTP id 6a1803df08f44-6b61bc7b426mr6485786d6.3.1720796811290; Fri, 12 Jul 2024 08:06:51 -0700 (PDT) Date: Fri, 12 Jul 2024 08:06:51 -0700 (PDT) From: Cedric Hombourger To: isar-users Message-Id: <046d8ffa-de20-4636-87e2-17a1d0696190n@googlegroups.com> In-Reply-To: <20240712054327.9526-2-ubely@ilbers.de> References: <20240712054327.9526-1-ubely@ilbers.de> <20240712054327.9526-2-ubely@ilbers.de> Subject: Re: [PATCH v2 1/3] meta: Fix do_copy_boot_files error for different distros of same machine MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_182504_1711418046.1720796811146" X-Original-Sender: chombourger@gmail.com 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-Spam-Status: No, score=-4.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,MAILING_LIST_MULTI, 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-TUID: rOBtnltKGErm ------=_Part_182504_1711418046.1720796811146 Content-Type: multipart/alternative; boundary="----=_Part_182505_1717237551.1720796811146" ------=_Part_182505_1717237551.1720796811146 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Le vendredi 12 juillet 2024 =C3=A0 07:43:37 UTC+2, Uladzimir Bely a =C3=A9c= rit : From: Ilia Skochilov =20 When building different distros with the same machine (e.g.,=20 phyboard-mira-bullseye and phyboard-mira-bookworm) it happens that=20 some files with the same name (e.g, DTB files) are deployed=20 to the same location and this causes build error.=20 Use DISTRO-dependent deploy directory.=20 Signed-off-by: Ilia Skochilov =20 Signed-off-by: Uladzimir Bely =20 ---=20 RECIPE-API-CHANGELOG.md | 8 ++++++++=20 meta/conf/bitbake.conf | 2 +-=20 2 files changed, 9 insertions(+), 1 deletion(-)=20 diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md=20 index 12ea93ec..15337a63 100644=20 --- a/RECIPE-API-CHANGELOG.md=20 +++ b/RECIPE-API-CHANGELOG.md=20 @@ -629,3 +629,11 @@ into kernel kbuild package.=20 Only the "host" specific package is built automatically at cross builds.=20 * Support emulated module build with cross-compiled kernel for linux-module= =20 +=20 +### Change DEPLOY_DIR_IMAGE=20 +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to=20 +${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}. When building different distros= =20 +with the same machine the following error occurs: =20 since layers may have multiple kernels (e.g. rt and non-rt) for the same=20 machine (and ${DISTRO}), you may need to append -${KERNEL_NAME} I otherwise fear that some deployments will continue to fail =20 +do_copy_boot_files: The recipe isar-image-base is trying to install files= =20 +into a shared area when those files already exists. It happens when some= =20 +files have the same names (e.g., dtb files) for different distros.=20 diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf=20 index 4cfa8b10..1087ca0f 100644=20 --- a/meta/conf/bitbake.conf=20 +++ b/meta/conf/bitbake.conf=20 @@ -56,7 +56,7 @@ WORKDIR =3D=20 "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}"=20 GIT_DL_LINK_DIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}"=20 DEPLOY_DIR_BOOTSTRAP =3D "${DEPLOY_DIR}/bootstrap"=20 DEPLOY_DIR_SDKCHROOT =3D "${DEPLOY_DIR}/sdkchroot"=20 -DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images/${MACHINE}"=20 +DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}"=20 DL_DIR ?=3D "${TOPDIR}/downloads"=20 SSTATE_DIR ?=3D "${TOPDIR}/sstate-cache"=20 SSTATE_MANIFESTS =3D "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}"=20 --=20 2.44.2=20 --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/= isar-users/046d8ffa-de20-4636-87e2-17a1d0696190n%40googlegroups.com. ------=_Part_182505_1717237551.1720796811146 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Le vendredi 12 juillet 2024 =C3=A0 07:43= :37 UTC+2, Uladzimir Bely a =C3=A9crit=C2=A0:
From: Ilia Skochilov <i= skoc...@ilbers.de>

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-dependent deploy directory.

Signed-off-by: Ilia Skochilov <iskoc= ...@ilbers.de>
Signed-off-by: Uladzimir Bely <ub...= @ilbers.de>
---
RECIPE-API-CHANGELOG.md | 8 ++++++++
meta/conf/bitbake.conf | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index 12ea93ec..15337a63 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -629,3 +629,11 @@ into kernel kbuild package.
Only the "host" specific package is built automatically at cross= builds.
=20
* Support emulated module build with cross-compiled kernel for lin= ux-module
+
+### Change DEPLOY_DIR_IMAGE
+Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to
+${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}. When building different d= istros
+with the same machine the following error occurs:
= =C2=A0
since layers may have multiple kernels (e.g. rt and non-rt= ) for the same machine (and ${DISTRO}), you may need to append -${KERNEL_NA= ME}
I otherwise fear that some deployments will continue to fail<= /div>
=C2=A0

+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.
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4cfa8b10..1087ca0f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -56,7 +56,7 @@ WORKDIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH= }/${PN}/${PV}-${PR}"
GIT_DL_LINK_DIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}"
DEPLOY_DIR_BOOTSTRAP =3D "${DEPLOY_DIR}/bootstrap"
DEPLOY_DIR_SDKCHROOT =3D "${DEPLOY_DIR}/sdkchroot"
-DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images/${MACHINE}"
+DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}"
DL_DIR ?=3D "${TOPDIR}/downloads"
SSTATE_DIR ?=3D "${TOPDIR}/sstate-cache"
SSTATE_MANIFESTS =3D "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_AR= CH}"
--=20
2.44.2

--
You received this message because you are subscribed to the Google Groups &= quot;isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-use= rs+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msg= id/isar-users/046d8ffa-de20-4636-87e2-17a1d0696190n%40googlegroups.com.=
------=_Part_182505_1717237551.1720796811146-- ------=_Part_182504_1711418046.1720796811146--