2 files changed, 6 insertions, 5 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c26beea959..30fcc7947b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -725,3 +725,9 @@ DISTRO[unexport] = "1"
 
 # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
 TRANSLATED_TARGET_ARCH ??= ${TARGET_ARCH}
+
+# 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"
+
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 6fae948b1b..e6ef465052 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -167,8 +167,3 @@ ftp://.*/.*      http://autobuilder.pokylinux.org/sources/ \n \
 http://.*/.*     http://autobuilder.pokylinux.org/sources/ \n \
 https://.*/.*    http://autobuilder.pokylinux.org/sources/ \n"
 
-# Setup our 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"
-