summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-20 14:05:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-21 11:54:48 +0000
commit264f19f6862dbab5abf7ff27a79bd088ac44b6c4 (patch)
treea583175792365034e2fbc950e9535d85927b8b6a /meta-poky/conf/distro
parent83b587e77baac9991a1073af99c82210d07e2b90 (diff)
downloadpoky-264f19f6862dbab5abf7ff27a79bd088ac44b6c4.tar.gz
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>
Diffstat (limited to 'meta-poky/conf/distro')
-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 3f84c7daf0..c9c3ed976a 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}" 26SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${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}"