From: Joshua Watt <jpewhacker@gmail.com>
Date: Wed, 21 Nov 2018 16:37:05 +0000 (-0600)
Subject: poky.conf: Include SDKMACHINE in SDK name
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba1456ab7e6101ae83532ef5e01d5c252d13465c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

poky.conf: Include SDKMACHINE in SDK name

Replace SDK_ARCH with SDKMACHINE so that SDK targeting different
development machines but having the same architecture don't cause
similar errors as found in '3614dd4aee9 ("poky.conf: Add MACHINE to
SDK_NAME")'

This doesn't have any effect on the SDK machines provided in oe-core,
since SDK_ARCH is the same as SDKMACHINE for all of them.

(From meta-yocto rev: 951184fd62b3ab14266f300defd47d3c5c09ad9b)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index c9c3ed976a2..f5de8f2335d 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -23,7 +23,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE
 
 PREFERRED_VERSION_linux-yocto ?= "4.18%"
 
-SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
+SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"