From: Denys Dmytriyenko <denis@denix.org>
Date: Fri, 22 Sep 2023 22:20:42 +0000 (+0000)
Subject: bitbake.conf: add MACHINE to SDK_NAME
X-Git-Tag: yocto-5.2~5094
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bbefd9602dd787866a80e4be6c1cb13d0ccdb0f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake.conf: add MACHINE to SDK_NAME

Do the same here as Poky has done 5 years ago, adding MACHINE to
SDK_NAME:

https://git.yoctoproject.org/meta-yocto/commit/?id=3614dd4aee9d19f1024edb6a36b2862c2d726c04

This avoids file conflicts in deploy/sdk/ when building multiple
machines (either manually or via multiconfig), where sdk/toolchain
installers, manifests and now SPDX archives will overlap otherwise.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7be5cbc992a..21d6c8b1eb0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -459,7 +459,7 @@ PKGDATA_DIR_SDK = "${TMPDIR}/pkgdata/${SDK_SYS}"
 ##################################################################
 
 SDK_NAME_PREFIX ?= "oecore"
-SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}"
+SDK_NAME = "${SDK_NAME_PREFIX}-${IMAGE_BASENAME}-${SDK_ARCH}-${TUNE_PKGARCH}-${MACHINE}"
 SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
 # The path to default to installing the SDK to