[poky] [PATCHv2] factor out shared state settings into a .inc
Koen Kooi
koen at dominion.thruhere.net
Thu Dec 30 03:24:46 PST 2010
From: Koen Kooi <koen at dominion.thruhere.net>
This allows other distros to keep up with the latest shared state improvements
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
Changes since v1: Add missing quote
meta/conf/distro/include/sstate.inc | 9 +++++++++
meta/conf/distro/poky.conf | 9 +++------
2 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 meta/conf/distro/include/sstate.inc
diff --git a/meta/conf/distro/include/sstate.inc b/meta/conf/distro/include/sstate.inc
new file mode 100644
index 0000000..723359b
--- /dev/null
+++ b/meta/conf/distro/include/sstate.inc
@@ -0,0 +1,9 @@
+# Common include file for shared state related matters
+
+INHERIT += "sstate"
+
+# 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"
+patch_do_patch[vardepsexclude] = "DATE SRCDATE"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index fe2d49a..ce6c324 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -12,7 +12,7 @@ USER_CLASSES ?= ""
PACKAGE_CLASSES ?= "package_ipk"
INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE}"
# For some reason, this doesn't work
# TARGET_OS ?= "linux"
# TARGET_VENDOR ?= "-poky"
@@ -167,8 +167,5 @@ 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"
-patch_do_patch[vardepsexclude] = "DATE SRCDATE"
+require conf/distro/include/sstate.inc
+
--
1.6.6.1
More information about the poky
mailing list