diff options
-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 b94ed4853..e49017624 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass | |||
@@ -45,6 +45,7 @@ CROSS_METHOD ?= "answer" | |||
45 | do_configure() { | 45 | do_configure() { |
46 | 46 | ||
47 | # Prepare the cross-answers file | 47 | # Prepare the cross-answers file |
48 | WAF_CROSS_ANSWERS_PATH="${THISDIR}/../../files/waf-cross-answers" | ||
48 | CROSS_ANSWERS="${B}/cross-answers-${TARGET_ARCH}.txt" | 49 | CROSS_ANSWERS="${B}/cross-answers-${TARGET_ARCH}.txt" |
49 | if [ -e ${CROSS_ANSWERS} ]; then | 50 | if [ -e ${CROSS_ANSWERS} ]; then |
50 | rm -f ${CROSS_ANSWERS} | 51 | rm -f ${CROSS_ANSWERS} |
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index c09ba4a47..85ad93bda 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf | |||
@@ -19,8 +19,5 @@ LAYERDEPENDS_networking-layer += "meta-python" | |||
19 | 19 | ||
20 | LICENSE_PATH += "${LAYERDIR}/licenses" | 20 | LICENSE_PATH += "${LAYERDIR}/licenses" |
21 | 21 | ||
22 | # used by waf-samba.bbclass | ||
23 | WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers" | ||
24 | |||
25 | # Override security flags | 22 | # Override security flags |
26 | require conf/distro/include/meta_networking_security_flags.inc | 23 | require conf/distro/include/meta_networking_security_flags.inc |