summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-11-21 10:37:05 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-21 17:19:29 +0000
commitba1456ab7e6101ae83532ef5e01d5c252d13465c (patch)
tree9093c500e5a325ce97389fba4ac8dba58bfb3f4d
parent264f19f6862dbab5abf7ff27a79bd088ac44b6c4 (diff)
downloadpoky-ba1456ab7e6101ae83532ef5e01d5c252d13465c.tar.gz
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>
-rw-r--r--meta-poky/conf/distro/poky.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index c9c3ed976a..f5de8f2335 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
23 23
24PREFERRED_VERSION_linux-yocto ?= "4.18%" 24PREFERRED_VERSION_linux-yocto ?= "4.18%"
25 25
26SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" 26SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
27SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" 27SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
28 28
29DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 29DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"