diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-13 19:25:14 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:37:48 -0700 |
commit | 514a9e31ee03976e4280fac36038379d6ac50723 (patch) | |
tree | 37d8a44c00c517510fdb69570ad806acafbd4eae | |
parent | a116115efb97fe8b60ddb8bc449ebae36946218f (diff) | |
download | meta-openembedded-514a9e31ee03976e4280fac36038379d6ac50723.tar.gz |
wifi-test-suite: Update to latest tip
Fix build with gcc10/-fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch new file mode 100644 index 0000000000..fc5e2e99c5 --- /dev/null +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Mark extern variables with 'extern' keyword | ||
2 | |||
3 | This ensures that compilers with -fno-common does not generate multiple definitions | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signedd-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | --- a/lib/wfa_cs.c | ||
9 | +++ b/lib/wfa_cs.c | ||
10 | @@ -71,7 +71,7 @@ int wfaExecuteCLI(char *CLI); | ||
11 | |||
12 | /* Since the two definitions are used all over the CA function */ | ||
13 | char gCmdStr[WFA_CMD_STR_SZ]; | ||
14 | -dutCmdResponse_t gGenericResp; | ||
15 | +extern dutCmdResponse_t gGenericResp; | ||
16 | int wfaTGSetPrio(int sockfd, int tgClass); | ||
17 | void create_apts_msg(int msg, unsigned int txbuf[],int id); | ||
18 | |||
19 | --- a/lib/wfa_thr.c | ||
20 | +++ b/lib/wfa_thr.c | ||
21 | @@ -41,7 +41,7 @@ | ||
22 | /* | ||
23 | * external global thread sync variables | ||
24 | */ | ||
25 | -tgWMM_t wmm_thr[WFA_THREADS_NUM]; | ||
26 | +extern tgWMM_t wmm_thr[WFA_THREADS_NUM]; | ||
27 | extern int resetsnd; | ||
28 | extern int resetrcv; | ||
29 | extern int newCmdOn; | ||
diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb index 99cfb32051..cb39f5a0e1 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb | |||
@@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" | |||
8 | SECTION = "test" | 8 | SECTION = "test" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "f7a8d7ef7d1a831c1bb47de21fa083536ea2f3a9" | 11 | SRCREV = "2da947374c8324f88a0e2155aeba4cf75464b0d8" |
12 | SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ | 12 | SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ |
13 | file://0001-Use-toolchain-from-environment-variables.patch \ | 13 | file://0001-Use-toolchain-from-environment-variables.patch \ |
14 | file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ | 14 | file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ |
15 | file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ | 15 | file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ |
16 | file://0004-run-ranlib-per-library-and-use-AR.patch \ | 16 | file://0004-run-ranlib-per-library-and-use-AR.patch \ |
17 | file://fno-common.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | # to avoid host path QA error | 20 | # to avoid host path QA error |