[oe] [PATCH v3] wifi-test-suite: Initial recipe for wifi test suite.
Khem Raj
raj.khem at gmail.com
Thu Dec 27 07:18:45 UTC 2018
On Wed, Dec 26, 2018 at 11:13 PM Ankit Navik <ankit.tarot at gmail.com> wrote:
>
> Hi Raj,
>
> On Tue, Dec 25, 2018 at 11:45 PM Khem Raj <raj.khem at gmail.com> wrote:
>>
>> Hi Ankit
>>
>> I provided some additional comments inline
>>
>>
>> On Tue, Dec 25, 2018 at 12:23 AM Ankit Navik <ankit.tarot at gmail.com> wrote:
>> >
>> > Add generic recipe for wifi test suite from wifi alliance.
>> > Suite is to support certification program development and device certification.
>> >
>> > Signed-off-by: Ankit Navik <ankit.tarot at gmail.com>
>> > ---
>> > ...-Use-toolchain-from-environment-variables.patch | 92 ++++++++++++++++++++++
>> > ...-include-removes-unnedded-stuff-and-add-n.patch | 45 +++++++++++
>> > .../0003-fix-path-to-usr-sbin-for-script.patch | 35 ++++++++
>> > .../wifi-test-suite/wifi-test-suite_git.bb | 35 ++++++++
>> > 4 files changed, 207 insertions(+)
>> > create mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch
>> > create mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch
>> > create mode 100644 meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script.patch
>> > create 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-Use-toolchain-from-environment-variables.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch
>> > new file mode 100644
>> > index 0000000..9ee4a51
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch
>> > @@ -0,0 +1,92 @@
>> > +From 6b822b36739222d0c864249992b5d28e3ff4d948 Mon Sep 17 00:00:00 2001
>> > +From: Adrian Friedli <adrian.friedli at husqvarnagroup.com>
>> > +Date: Mon, 3 Sep 2018 17:58:27 +0200
>> > +Subject: [PATCH] Use toolchain from environment variables
>> > +
>> > +Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/42]
>> > +Signed-off-by: Adrian Friedli <adrian.friedli at husqvarnagroup.com>
>> > +Signed-off-by: Ankit Navik <ankit.tarot at gmail.com>
>> > +---
>> > + Makefile.inc | 7 ++++---
>> > + WTGService/Makefile | 2 +-
>> > + console_src/Makefile | 2 +-
>> > + lib/Makefile | 6 +++---
>> > + 4 files changed, 9 insertions(+), 8 deletions(-)
>> > +
>> > +diff --git a/Makefile.inc b/Makefile.inc
>> > +index b0edf5a..0094bdf 100644
>> > +--- a/Makefile.inc
>> > ++++ b/Makefile.inc
>> > +@@ -13,14 +13,15 @@
>> > + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
>> > + # USE OR PERFORMANCE OF THIS SOFTWARE.
>> > + #
>> > +-CC = gcc
>> > ++CC ?= gcc
>> > ++AR ?= ar
>> > + LIB=lib
>> > + DUT=dut
>> > + CA=ca
>> > + UCC=ucc
>> > + CON=console_src
>> > + WTG=WTGService
>> > +-MAKE=make
>> > ++MAKE?=make
>> > +
>> > + # This is for WMM-PS
>> > + #for Ext TG
>> > +@@ -46,7 +47,7 @@ CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc
>> > +
>> > + DUTLIBS = ../lib/libwfa_dut.a -lpthread
>> > + CALIBS = ../lib/libwfa_ca.a -lpthread
>> > +-RANLIB = ranlib
>> > ++RANLIB ?= ranlib
>> > +
>> > + LIBWFA_NAME_DUT = libwfa_dut.a
>> > + LIBWFA_NAME_CA = libwfa_ca.a
>> > +diff --git a/WTGService/Makefile b/WTGService/Makefile
>> > +index 5312eb6..4855771 100644
>> > +--- a/WTGService/Makefile
>> > ++++ b/WTGService/Makefile
>> > +@@ -13,7 +13,7 @@
>> > + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
>> > + # USE OR PERFORMANCE OF THIS SOFTWARE.
>> > + #
>> > +-CC=gcc
>> > ++CC?=gcc
>> > + CFLAGS= -Wall
>> > + LIB=-lpthread
>> > +
>> > +diff --git a/console_src/Makefile b/console_src/Makefile
>> > +index 8282283..d1098eb 100644
>> > +--- a/console_src/Makefile
>> > ++++ b/console_src/Makefile
>> > +@@ -14,7 +14,7 @@
>> > + # USE OR PERFORMANCE OF THIS SOFTWARE.
>> > + #
>> > +
>> > +-CC = gcc
>> > ++CC ?= gcc
>> > + CFLAGS = -g -DWFA_DEBUG -pthread
>> > +
>> > + TARGETS = wfa_con
>> > +diff --git a/lib/Makefile b/lib/Makefile
>> > +index ffcef94..299b8d6 100644
>> > +--- a/lib/Makefile
>> > ++++ b/lib/Makefile
>> > +@@ -17,9 +17,9 @@
>> > + include ../Makefile.inc
>> > +
>> > + all: ${LIB_OBJS}
>> > +- ar crv ${LIBWFA_NAME} $?
>> > +- ar crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT}
>> > +- ar crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA}
>> > ++ $(AR) crv ${LIBWFA_NAME} $?
>> > ++ $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT}
>> > ++ $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA}
>> > + ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA}
>> > +
>> > + wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h
>> > +--
>> > +2.7.4
>> > +
>> > diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch
>> > new file mode 100644
>> > index 0000000..43be917
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch
>> > @@ -0,0 +1,45 @@
>> > +From 451b162c903a1ef070a75dc18171620f3beef7b3 Mon Sep 17 00:00:00 2001
>> > +From: Ankit Navik <ankit.tarot at gmail.com>
>> > +Date: Tue, 25 Dec 2018 00:36:59 +0530
>> > +Subject: [PATCH 2/3] Add missing include, removes unnedded stuff and add non
>> > + glib rpc
>>
>> typo here, I guess you mean glibc.
>>
>> > +
>> > +Upstream-Status: Inappropriate [embedded specific]
>> > +
>> > +Signed-off-by: Reto Schneider <code at reto-schneider.ch>
>> > +Signed-off-by: Ankit Navik <ankit.tarot at gmail.com>
>> > +---
>> > + Makefile | 2 +-
>> > + inc/wfa_tg.h | 3 +++
>> > + 2 files changed, 4 insertions(+), 1 deletion(-)
>> > +
>> > +diff --git a/Makefile b/Makefile
>> > +index 2c41a17..5c4ad8c 100644
>> > +--- a/Makefile
>> > ++++ b/Makefile
>> > +@@ -15,7 +15,7 @@
>> > + #
>> > + include Makefile.inc
>> > +
>> > +-DIRS= ${LIB} ${DUT} ${CA} ${TC} ${WTG} ${CON}
>> > ++DIRS= ${LIB} ${DUT} ${CA} ${TC}
>> > +
>> > + all:
>> > + for i in ${DIRS}; do \
>> > +diff --git a/inc/wfa_tg.h b/inc/wfa_tg.h
>> > +index 799bf9f..a1804dd 100644
>> > +--- a/inc/wfa_tg.h
>> > ++++ b/inc/wfa_tg.h
>> > +@@ -24,6 +24,9 @@
>> > + #ifndef _WFA_TG_H
>> > + #define _WFA_TG_H
>> > +
>> > ++#ifndef _WINDOWS
>> > ++#include <pthread.h>
>> > ++#endif
>> > + #include <sys/time.h>
>> > +
>> > + /* maximum number of streams to support */
>> > +--
>> > +2.7.4
>> > +
>> > diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script.patch
>> > new file mode 100644
>> > index 0000000..23dae6a
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script.patch
>> > @@ -0,0 +1,35 @@
>> > +From ee5ffceb8c29cb66f323158123c9103d47965184 Mon Sep 17 00:00:00 2001
>> > +From: Ankit Navik <ankit.tarot at gmail.com>
>> > +Date: Tue, 25 Dec 2018 01:12:32 +0530
>> > +Subject: [PATCH 3/3] fix path to /usr/sbin for script
>> > +
>> > +Signed-off-by: Ankit Navik <ankit.tarot at gmail.com>
>> > +---
>> > + lib/wfa_cs.c | 4 ++--
>> > + 1 file changed, 2 insertions(+), 2 deletions(-)
>> > +
>> > +diff --git a/lib/wfa_cs.c b/lib/wfa_cs.c
>> > +index 6b1f5a2..2a18533 100644
>> > +--- a/lib/wfa_cs.c
>> > ++++ b/lib/wfa_cs.c
>> > +@@ -319,7 +319,7 @@ int wfaStaGetIpConfig(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf)
>> > + /*
>> > + * check a script file (the current implementation specific)
>> > + */
>> > +- ret = access("/usr/local/sbin/getipconfig.sh", F_OK);
>> > ++ ret = access("/usr/sbin/getipconfig.sh", F_OK);
>> > + if(ret == -1)
>> > + {
>> > + ipconfigResp->status = STATUS_ERROR;
>> > +@@ -2115,7 +2115,7 @@ int wfaStaPresetParams(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf)
>> > + st = remove("/tmp/processid.txt");
>> > + }
>> > +
>> > +- sprintf(cmdStr, "/usr/local/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant");
>> > ++ sprintf(cmdStr, "/usr/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant");
>> > + st = system(cmdStr);
>> > +
>> > + tmpfd = fopen("/tmp/processid.txt", "r+");
>> > +--
>> > +2.7.4
>> > +
>> > 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
>> > new file mode 100644
>> > index 0000000..164d5d6
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb
>> > @@ -0,0 +1,35 @@
>> > +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"
>>
>> I see above that some scripts are calling wpa_supplicant, but its not
>> in RDEPENDS
>> probably that needs to be added here via RDEPENDS_${PN}
>>
>> > +
>> > +S = "${WORKDIR}/git"
>> > +SRCREV = "f7a8d7ef7d1a831c1bb47de21fa083536ea2f3a9"
>> > +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \
>> > + 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.patch \
>> > +"
>> > +
>> > +# Fix for non glib based rpc and to avoid host path QA error
>>
>> latest glibc uses tirpc too. so this comment should not call out glibc
>> host path QA could still be valid.
>>
>> > +CFLAGS += "-I${STAGING_INCDIR}/tirpc"
>> > +
>> > +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 0644 ${S}/scripts/*.sh ${D}${sbindir}
>>
>> scripts should be 0755
>>
>> > + install -m 0644 ${S}/scripts/arp_neigh_loop ${D}${sbindir}
>> > + install -m 0644 ${S}/scripts/dev_send_frame ${D}${sbindir}
>> > + install -m 0644 ${S}/scripts/sta_reset_parm ${D}${sbindir}
>>
>> are these config files or scripts which are executed, in case of scripts
>> then 0755 is right mode
>>
>>
>> > +}
>> > +
>> > +INSANE_SKIP_${PN} = "ldflags"
>>
>> why do we need this ?
>
> There was an error " No GNU_HASH in the ELF binary" and "didn't pass LDFLAGS? [ldflags]"
>
You might want to add
TARGET_CC_ARCH += "${LDFLAGS}"
to fix gnu hash errors.
> Regards, Ankit
>>
>>
>> > --
>> > 2.7.4
>> >
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel at lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
More information about the Openembedded-devel
mailing list