When multilib is enabled, there would be two different recipe specific sysroot directories: libxx-recipe-sysroot recipe-sysroot
We do need to access the files under the "recipe-sysroot" directory in some cases. So introduces these variables for this purpose. Signed-off-by: Kevin Hao <[email protected]> --- meta/conf/bitbake.conf | 4 ++++ meta/conf/multilib.conf | 1 + 2 files changed, 5 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 93aee1ae4628..b7e3e5ca26df 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -370,6 +370,7 @@ STAGING_DIR = "${TMPDIR}/sysroots" COMPONENTS_DIR = "${STAGING_DIR}-components" RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot" RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native" +RECIPE_ALT_SYSROOT = "${RECIPE_SYSROOT}" STAGING_DIR_NATIVE = "${RECIPE_SYSROOT_NATIVE}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" @@ -394,6 +395,9 @@ STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" +STAGING_ALT_DIR_HOST = "${RECIPE_ALT_SYSROOT}" +STAGING_ALT_DATADIR = "${STAGING_ALT_DIR_HOST}${datadir}" + STAGING_DIR_TARGET = "${RECIPE_SYSROOT}" # Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index e74dec81a897..4dd824fdb273 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -9,6 +9,7 @@ MULTILIBS ??= "multilib:lib32" STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +RECIPE_ALT_SYSROOT = "${WORKDIR}/recipe-sysroot" INHERIT += "multilib_global" -- 2.14.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
