[oe-commits] [meta-openembedded] 08/18: waf-samba.bbclass: redefine WAF_CROSS_ANSWERS_PATH

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit b30acfa746cfae8e5d7f1834dcf09d389c295bc2
Author: Mingli Yu <Mingli.Yu at windriver.com>
AuthorDate: Mon Apr 10 14:04:17 2017 +0800

    waf-samba.bbclass: redefine WAF_CROSS_ANSWERS_PATH
    
    * Redefine WAF_CROSS_ANSWERS_PATH in waf-samba.bbclass
      to fix checksum mismatch for those packages which
      inherit waf-samba.bbclass when install eSDK
      # bitbake-diffsigs $Prj/build/sdkext_dir/tmp/stamps/core2-64-wrs-linux/libtalloc/2.1.8-r0.do_configure.sigdata.8a0fd2871f1e464f4586c32f0e67378f $Prj/build/tmp/stamps/core2-64-wrs-linux/libtalloc/2.1.8-r0.do_configure.sigdata.16b87e6ddccb52ca5e988e928f111e5a
      basehash changed from ea2fea38e7efe710a11fa9d13c7ad94c to 943a7ead4ed10ce794532a942569bcf9
      Variable WAF_CROSS_ANSWERS_PATH value changed from '$Prj/build/sdkext_dir/layers/meta-networking/files/waf-cross-answers' to '$Prj/layers/meta-openembedded/meta-networking/files/waf-cross-answers'
    
    * Remove the previous WAF_CROSS_ANSWERS_PATH definition
      in layer.conf
    
    Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/classes/waf-samba.bbclass | 1 +
 meta-networking/conf/layer.conf           | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index b94ed48..e490176 100644
--- a/meta-networking/classes/waf-samba.bbclass
+++ b/meta-networking/classes/waf-samba.bbclass
@@ -45,6 +45,7 @@ CROSS_METHOD ?= "answer"
 do_configure() {
 
     # Prepare the cross-answers file
+    WAF_CROSS_ANSWERS_PATH="${THISDIR}/../../files/waf-cross-answers"
     CROSS_ANSWERS="${B}/cross-answers-${TARGET_ARCH}.txt"
     if [ -e ${CROSS_ANSWERS} ]; then
         rm -f ${CROSS_ANSWERS}
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index c09ba4a..85ad93b 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -19,8 +19,5 @@ LAYERDEPENDS_networking-layer += "meta-python"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-# used by waf-samba.bbclass
-WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers"
-
 # Override security flags
 require conf/distro/include/meta_networking_security_flags.inc

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.