Re: [PATCH v2 1/3] meta: Fix do_copy_boot_files error for different distros of same machine

[Cedric Hombourger <chombourger@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 2758 bytes --]



Le vendredi 12 juillet 2024 à 07:43:37 UTC+2, Uladzimir Bely a écrit :

From: Ilia Skochilov <iskoc...@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. 

* Support emulated module build with cross-compiled kernel for linux-module 
+ 
+### Change DEPLOY_DIR_IMAGE 
+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:

 
since layers may have multiple kernels (e.g. rt and non-rt) for the same 
machine (and ${DISTRO}), you may need to append -${KERNEL_NAME}
I otherwise fear that some deployments will continue to fail
 


+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 = 
"${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}" 
-- 
2.44.2 

-- 
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 email 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.

[-- Attachment #1.2: Type: text/html, Size: 3710 bytes --]