[PATCH] sdk: do not mix distros

[PATCH] sdk: do not mix distros

[Anton Mikanovich]

Add distro to the SDK link name to avoid mixing outputs for different
distros. Also remove duplicated SDKCHROOT_DIR definitions.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/sdk.bbclass | 3 ---
 meta/conf/bitbake.conf   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 477dff7..38671bb 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -26,9 +26,6 @@ python sdk_virtclass_handler() {
 addhandler sdk_virtclass_handler
 sdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
 
-# SDK is image-specific:
-SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${MACHINE}"
-
 # SDK settings
 SDK_INCLUDE_ISAR_APT ?= "0"
 SDK_FORMATS ?= "tar.xz"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a05bd90..20a218f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -58,7 +58,7 @@ SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}"
 BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}"
 BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}"
-SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${DISTRO}-${DISTRO_ARCH}"
+SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${DISTRO}-${MACHINE}"
 CACHE = "${TMPDIR}/cache"
 KERNEL_FILE ?= "vmlinuz"
 KERNEL_FILE_mipsel ?= "vmlinux"
-- 
2.30.2

Re: [PATCH] sdk: do not mix distros

[Anton Mikanovich]

15.06.2022 22:15, Anton Mikanovich wrote:
> Add distro to the SDK link name to avoid mixing outputs for different
> distros. Also remove duplicated SDKCHROOT_DIR definitions.
>
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
Applied to next.