aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ade0eff6099..067cc1e30d1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -695,6 +695,10 @@ MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}"
+# EXTRA_LOCAL_CONF will be parsed after local.conf, so it is possible to have
+# a configuration file shared between different builds.
+INCLUDE_EXTRA_LOCAL_CONF = "${@d.getVar('BB_EXTRA_LOCAL_CONF') or 'extra_local.conf'}"
+
##################################################################
# Include the rest of the config files.
##################################################################
@@ -703,6 +707,7 @@ require conf/abi_version.conf
include conf/site.conf
include conf/auto.conf
include conf/local.conf
+include ${INCLUDE_EXTRA_LOCAL_CONF}
require conf/multiconfig/${BB_CURRENT_MC}.conf
include conf/build/${BUILD_SYS}.conf
include conf/machine/${MACHINE}.conf