factor out shared state settings into a .inc
PATCH 1/1 factor out shared state settings into a .inc
From: Koen Kooi <[email protected]>
This allows other distros to keep up with the latest shared state improvements
Signed-off-by Koen Kooi <[email protected]>
--- 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
meta/conf/distro/include/sstate.inc new file +9 -0
@@ -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
meta/conf/distro/poky.conf +3 -6
@@ -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 +
Signature · 1 line
1.6.6.1
PATCH v2 1/1 factor out shared state settings into a .inc
From: Koen Kooi <[email protected]>
This allows other distros to keep up with the latest shared state improvements
Signed-off-by Koen Kooi <[email protected]>
---
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
meta/conf/distro/include/sstate.inc new file +9 -0
@@ -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"
meta/conf/distro/poky.conf +3 -6
@@ -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 +
Signature · 1 line
1.6.6.1
Quoted 5 lines · Koen Kooi
From: Koen Kooi <[email protected]>
This allows other distros to keep up with the latest shared state improvements
Signed-off-by Koen Kooi <[email protected]>
This is a good point but I've done this slightly differently. I've moved the definitions to bitbake.conf with a ?= assignment so people can override as needed. I also moved the do_patch variable exclude to live alongside the function it refers to.
Cheers,
Richard