diff options
| author |   Mingli Yu <Mingli.Yu@windriver.com> | 2017-04-10 14:04:17 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2017-04-26 10:06:32 -0400 |
| commit | 33310f28907d4d7c493e4649cf6fbb7a526c034b (patch) | |
| tree | 9929a254203d3b4c7cc805dd29fae10cd7968527 /meta-networking | |
| parent | 066360f31ed5a77537d52bb8f91f019f16967b59 (diff) | |
| download | meta-openembedded-contrib-33310f28907d4d7c493e4649cf6fbb7a526c034b.tar.gz | |
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/classes/waf-samba.bbclass | 1 | ||||
| -rw-r--r-- | meta-networking/conf/layer.conf | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index b94ed4853d..e490176241 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 c09ba4a478..85ad93bda3 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 |