From fa3ccbc37d462606c852033fb790bd83e9e2ecb2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Aug 2022 19:43:35 -0700 Subject: wifi-test-suite: Fix build with clang Signed-off-by: Khem Raj --- ..._cmdproc-Store-return-value-into-location.patch | 32 +++++++++++++++++ .../wifi-test-suite/wifi-test-suite_10.10.1.bb | 40 ++++++++++++++++++++++ .../wifi-test-suite/wifi-test-suite_git.bb | 39 --------------------- 3 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch create mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb delete mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch new file mode 100644 index 0000000000..074f0fe7bb --- /dev/null +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch @@ -0,0 +1,32 @@ +From 2b7d6cf62296ff4e25e5ad909aa39a257bf9ff78 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 31 Aug 2022 19:37:35 -0700 +Subject: [PATCH] wfa_cmdproc: Store return value into location + +Fixes +| wfa_cmdproc.c:100:20: error: incompatible integer to pointer conversion assigning to 'int *' from 'int' [-Wint-conversion] +| paramValue = atoi(str); +| ^ ~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/57] +Signed-off-by: Khem Raj +--- + lib/wfa_cmdproc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/wfa_cmdproc.c b/lib/wfa_cmdproc.c +index 9f5fd16..49a3f16 100644 +--- a/lib/wfa_cmdproc.c ++++ b/lib/wfa_cmdproc.c +@@ -97,7 +97,7 @@ int getParamValueInt(char *pcmdStr, char *pParam, int *paramValue) + if(strcasecmp(pcmdStr, pParam) == 0) + { + str = strtok_r(NULL, ",", &pcmdStr); +- paramValue = atoi(str); ++ *paramValue = atoi(str); + return 0; + } + return -1; +-- +2.37.3 + diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb new file mode 100644 index 0000000000..eda01ca388 --- /dev/null +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb @@ -0,0 +1,40 @@ +SUMMARY = "Wi-Fi Test Suite Linux Control Agent" +DESCRIPTION = "Wi-Fi Test Suite is a software platform originally developed \ +by Wi-Fi Alliance, the global non-profit industry association that brings you \ +Wi-Fi, to support certification program development and device certification." +HOMEPAGE = "https://www.wi-fi.org/certification/wi-fi-test-suite" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" +SECTION = "test" + +S = "${WORKDIR}/git" +SRCREV = "12e85fbeca8ca21a632d18e55089a8a7606d64aa" +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \ + file://0001-Use-toolchain-from-environment-variables.patch \ + file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ + file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ + file://0004-run-ranlib-per-library-and-use-AR.patch \ + file://fno-common.patch \ + file://0001-wfa_cmdproc-Store-return-value-into-location.patch \ +" + +# to avoid host path QA error +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +# Fix GNU HASH error +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + install -d ${D}${libdir} + install -m 0644 ${S}/lib/libwfa.a ${D}${libdir} + install -m 0644 ${S}/lib/libwfa_ca.a ${D}${libdir} + install -m 0644 ${S}/lib/libwfa_dut.a ${D}${libdir} + install -d ${D}${sbindir} + install -m 0755 ${S}/dut/wfa_dut ${D}${sbindir} + install -m 0755 ${S}/ca/wfa_ca ${D}${sbindir} + install -m 0755 ${S}/scripts/*.sh ${D}${sbindir} + install -m 0755 ${S}/scripts/arp_neigh_loop ${D}${sbindir} + install -m 0755 ${S}/scripts/dev_send_frame ${D}${sbindir} + install -m 0755 ${S}/scripts/sta_reset_parm ${D}${sbindir} +} + +RDEPENDS:${PN} = "wpa-supplicant" 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 deleted file mode 100644 index 490f8324b4..0000000000 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Wi-Fi Test Suite Linux Control Agent" -DESCRIPTION = "Wi-Fi Test Suite is a software platform originally developed \ -by Wi-Fi Alliance, the global non-profit industry association that brings you \ -Wi-Fi, to support certification program development and device certification." -HOMEPAGE = "https://www.wi-fi.org/certification/wi-fi-test-suite" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" -SECTION = "test" - -S = "${WORKDIR}/git" -SRCREV = "2da947374c8324f88a0e2155aeba4cf75464b0d8" -SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \ - file://0001-Use-toolchain-from-environment-variables.patch \ - file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ - file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ - file://0004-run-ranlib-per-library-and-use-AR.patch \ - file://fno-common.patch \ -" - -# to avoid host path QA error -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -# Fix GNU HASH error -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${libdir} - install -m 0644 ${S}/lib/libwfa.a ${D}${libdir} - install -m 0644 ${S}/lib/libwfa_ca.a ${D}${libdir} - install -m 0644 ${S}/lib/libwfa_dut.a ${D}${libdir} - install -d ${D}${sbindir} - install -m 0755 ${S}/dut/wfa_dut ${D}${sbindir} - install -m 0755 ${S}/ca/wfa_ca ${D}${sbindir} - install -m 0755 ${S}/scripts/*.sh ${D}${sbindir} - install -m 0755 ${S}/scripts/arp_neigh_loop ${D}${sbindir} - install -m 0755 ${S}/scripts/dev_send_frame ${D}${sbindir} - install -m 0755 ${S}/scripts/sta_reset_parm ${D}${sbindir} -} - -RDEPENDS:${PN} = "wpa-supplicant" -- cgit v1.2.3-54-g00ecf