]> code.ossystems Code Review - openembedded-core.git/commit
wic: search nonarch STAGING_DATADIR for multilib
authorKai Kang <kai.kang@windriver.com>
Tue, 16 Oct 2018 08:29:14 +0000 (16:29 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 16 Oct 2018 19:25:37 +0000 (20:25 +0100)
commitdbae9a6f9a1c6cc7d4dd680d7bbda3dfa40f3491
tree64da0f612aa822fcc2652aa0506bb9f2dc609900
parent1bbaf8d198b121a2a6f033350d1de3baa0a1163c
wic: search nonarch STAGING_DATADIR for multilib

It fails to build multilib image such as lib32-core-image-minimal with
wic by set 'IMAGE_FSTYPES = "wic"':

| ERROR: Couldn't find correct bootimg_dir, exiting

When multilib is enabled, STAGING_DATADIR is expanded with MLPREFIX. But
dependencies of images such as syslinux is still populated to nonarch
STAGING_DATADIR.

Search nonarch STAGING_DATADIR to fix the error.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/wic/plugins/source/bootimg-pcbios.py