diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
-rw-r--r-- | meta/conf/prexport.conf | 1 | ||||
-rw-r--r-- | meta/conf/primport.conf | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 336b1d706..43eedad04 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -190,7 +190,7 @@ BP = "${BPN}-${PV}" # # network based PR service # -USE_PR_SERV = "${@[1,0][(d.getVar('PRSERV_HOST',1) is None) or (d.getVar('PRSERV_PORT',1) is None)]}" +USE_PR_SERV = "${@[1,0][((not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True))) and (not d.getVar('PRSERV_LOCKDOWN', True))]}" # Package info. @@ -732,7 +732,7 @@ BB_CONSOLELOG = "${TMPDIR}/cooker.log.${DATETIME}" # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "basic" BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" -BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE" +BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN" MLPREFIX ??= "" MULTILIB_VARIANTS ??= "" diff --git a/meta/conf/prexport.conf b/meta/conf/prexport.conf new file mode 100644 index 000000000..12f3acb2d --- /dev/null +++ b/meta/conf/prexport.conf @@ -0,0 +1 @@ +INHERIT += "prexport" diff --git a/meta/conf/primport.conf b/meta/conf/primport.conf new file mode 100644 index 000000000..d94ea1b1e --- /dev/null +++ b/meta/conf/primport.conf @@ -0,0 +1 @@ +INHERIT += "primport" |