[PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE

[Cedric Hombourger <Cedric_Hombourger@mentor.com>]

Align with OpenEmbedded and place image artifacts in a <machine> folder
in tmp/deploy/images/.

Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
 RECIPE-API-CHANGELOG.md     | 5 +++++
 meta/conf/isar-bitbake.conf | 1 +
 2 files changed, 6 insertions(+)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index c7b7552..95a5f96 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -6,6 +6,11 @@ Baseline: Release v0.5
 Upcoming changes (v0.7)
 -----------------------
 
+### location of image artifacts
+
+Align with OpenEmbedded and place image artifacts in a per-machine folder placed
+in tmp/deploy (to avoid collisions among other things).
+
 ### more consistent artifact names
 
 multiconfig image artifacts are all placed in tmp/deploy/images. They include
diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf
index 666c4a3..d552c03 100644
--- a/meta/conf/isar-bitbake.conf
+++ b/meta/conf/isar-bitbake.conf
@@ -19,6 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 DL_DIR = "${TOPDIR}/downloads"
 SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
 BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host/rootfs"
-- 
2.11.0