[OE-core] [PATCH 1/1] image.bbclass: set consistent staging dirs

[kai.kang at windriver.com]

From: Kai Kang <kai.kang at windriver.com>

When enable multilib, staging dirs are expanded with ${MLPREFIX} in
multilib.conf. For multilib image such as lib32-core-image-minimal, it
requires 64 bit packages at some situation. For example, it requires
syslinux, grub-efi etc when build 'wic' rootfs. But these 64 bit
packages are populated to 'recipe-sysroot' rather than
'lib32-recipe-sysroot'. And then causes do image fails.

Set consistent staging dirs for image to fix such issues.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 meta/classes/image.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 34fdbb0850..8e958ba919 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -603,6 +603,11 @@ MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${l
 MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
 MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
 
+# set consistent staging dirs
+RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot"
+STAGING_DIR_HOST = "${WORKDIR}/recipe-sysroot"
+STAGING_DIR_TARGET = "${WORKDIR}/recipe-sysroot"
+
 do_fetch[noexec] = "1"
 do_unpack[noexec] = "1"
 do_patch[noexec] = "1"
-- 
2.18.0