]> 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)
committerArmin Kuster <akuster808@gmail.com>
Sun, 7 Apr 2019 09:38:13 +0000 (15:08 +0530)
commit6f53c61dd989045a7075b678c7030421d715bc16
tree681cd30fbf999fad28ee804f296ee6bb89db76a4
parent6b5681533eed4e6c00e1cc7ee442c93076f1c976
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/lib/wic/plugins/source/bootimg-pcbios.py