image.bbclass: set consistent staging dirs

From: Kai Kang <[email protected]>

V2:
* set consistent staging dirs for all images

The following changes since commit b02f3bfe2fee291a9db85094e5f31b1933acf871:

local.conf.sample.extended: add another warning to comment about GLIBC_GENERATE_LOCALES (2018-10-14 23:45:40 +0100)

are available in the Git repository at:

git://git.pokylinux.org/poky-contrib kangkai/image
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/image

Kai Kang (1):
image.bbclass: set consistent staging dirs

 meta/classes/image.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

2.18.0

From: Kai Kang <[email protected]>

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.

---
 meta/classes/image.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

index 34fdbb0850..8e958ba919 100644
@@ -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

Missing Richard's comment, please ignore this patch.

--Kai

Regards,
Neil | Kai Kang