summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-22 14:04:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 13:57:15 (GMT)
commiteaf54b8dbf9371965b4ccf18609edeb8eee16144 (patch)
treef8de04b97eac17919b8e8a574ae07203ebebb2a3
parent8b92304d8851b462610b0073f7c9cbed61eae2c4 (diff)
downloadpoky-eaf54b8dbf9371965b4ccf18609edeb8eee16144.tar.gz
bitbake.conf/abi_version.conf: Update to use BasicHash signature generator
This switches to use the hash based signature generatior and update layout_abi to match stamp file layout changes. Angstrom and Poky did this a while ago. This brings the OE-Core defaults into line with what is the best common practise at this point. Its been discussed on the mailing lists and by the TSC at length, this just completes the transition. (From OE-Core rev: 4199efed48005a62267fa3374c33b13627d85f44) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index f2919e5..83b668a 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "7" 7OELAYOUT_ABI = "8"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6fbc7a..fbc0ca2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -748,7 +748,7 @@ TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
748BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}" 748BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
749 749
750# Setup our default hash policy 750# Setup our default hash policy
751BB_SIGNATURE_HANDLER ?= "OEBasic" 751BB_SIGNATURE_HANDLER ?= "OEBasicHash"
752BB_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 PARALLEL_MAKE CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE" 752BB_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 PARALLEL_MAKE CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE"
753BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY PSEUDO_BUILD" 753BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY PSEUDO_BUILD"
754BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends lockfiles type vardepsexclude \ 754BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends lockfiles type vardepsexclude \