summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b69b6757db..3a68959c6c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -297,6 +297,7 @@ B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"
+STAGING_DIR_JAVA = "${STAGING_DIR}/java"
STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
@@ -688,6 +689,7 @@ include conf/documentation.conf
require conf/sanity.conf
require conf/abi_version.conf
require conf/enterprise.conf
+require conf/compatibility-providers.conf
##################################################################
# Weak variables (usually to retain backwards compatibility)