When building a multilib image (such as lib32-xxx), we do want the bootloader to be build in the 64bit mode. So it will be installed into a directory like: .../lib32-core-image-minimal/1.0-r0/recipe-sysroot/usr/share/
In this case, we need to set the bootimg_dir to use the value of STAGING_ALT_DATADIR. Signed-off-by: Kevin Hao <[email protected]> --- meta/classes/image_types_wic.bbclass | 2 +- scripts/wic | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 5b40a9e919f2..241e52b3e9f2 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -3,7 +3,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ - ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" + ROOTFS_SIZE STAGING_ALT_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" diff --git a/scripts/wic b/scripts/wic index 7392bc4e7f49..067acaabf030 100755 --- a/scripts/wic +++ b/scripts/wic @@ -166,7 +166,7 @@ def wic_create_subcommand(options, usage_str): rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) - bootimg_dir = get_bitbake_var("STAGING_DATADIR", options.image_name) + bootimg_dir = get_bitbake_var("STAGING_ALT_DATADIR", options.image_name) native_sysroot = options.native_sysroot if options.vars_dir and not native_sysroot: -- 2.14.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
