poky.conf: Add MACHINE to SDK_NAME

Avoid errors from:
MACHINE=qemux86-64 bitbake core-image-sato:do_populate_sdk
then:
MACHINE=genericx86-64 bitbake core-image-sato:do_populate_sdk

which gives:

ERROR: core-image-sato-1.0-r0 do_populate_sdk: The recipe core-image-sato is trying
to install files into a shared area when those files already exist. Those files and
 their manifest location are:
  deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.host.manifest
    (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk)
  deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.testdata.json
    (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk)
  deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.target.manifest
    (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk)
  deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.sh
    (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk)
Please verify which recipe should provide the above files.

Adding MACHINE to the artefact name will avoid this. The issue was highlighted by
changes to the autobuilder configuration.

(From meta-yocto rev: 3614dd4aee9d19f1024edb6a36b2862c2d726c04)

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 3f84c7daf0630da0d97fe28d59560860dd67ddcf..c9c3ed976a236f9b93435c939c3b09114e2f56a4 100644 (file)
--- 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}"
+SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"