Merge pull request #166 from rdkcentral/speedtest-changes

RDKBACCL-401 Speedtest Integration in BPI

Author: cpokuru

meta-rdk-mtk-bpir4/recipes-ccsp/util/test-and-diagnostic.bbappend

@@ -1 +1,5 @@
 include recipes-ccsp/ccsp/ccsp_common_bananapi.inc
+
+do_install_append () {
+       install -m 0755 ${S}/scripts/speedtest.sh ${D}/usr/ccsp/tad
+}

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend

@@ -6,6 +6,8 @@ IMAGE_INSTALL_append = " ccsp-tr069-pa"
 IMAGE_INSTALL_append = " bpi-serialnumber"
 IMAGE_INSTALL_append = " bpi-macaddress"
 
+
+IMAGE_INSTALL_append = " rdk-speedtest-cli"
 #Enable required linux utils for Fwupgrade
 IMAGE_INSTALL_append = " gptfdisk e2fsprogs-mke2fs"
 

meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend

@@ -1,5 +1,8 @@
 RDEPENDS_packagegroup-rdk-ccsp-broadband_remove = " rdk-wifi-hal"
 
+RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " rdk-speedtest-cli"
+RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " iperf3"
+
 RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " \
            ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'rdk-wifi-hal', '' ,d)} \
            ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', 'cpuprocanalyzer', ' ', d)} \

meta-rdk-mtk-bpir4/recipes-extended/speedtest-bpi/rdk-speedtest-cli_git.bb

@@ -0,0 +1,35 @@
+SUMMARY = "RDK Speed Test CLI tool"
+DESCRIPTION = "Command line tool for running iperf3 speed tests and updating RDK diagnostic parameters"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/rdkcentral/rdk-speedtest-cli.git;protocol=${CMF_GIT_PROTOCOL};branch=develop"
+SRCREV = "${AUTOREV}"
+PV = "1.0.0"
+CFLAGS_append += " -DRBUS_BUILD_INTEGRATED"
+CFLAGS_append += " -DRBUS_BUILD_FLAG_ENABLE"
+LDFLAGS_append = "-liperf -ltelemetry_msgsender -lrbus -lrtMessage -lrbuscore"
+
+S = "${WORKDIR}/git"
+
+inherit autotools ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)}
+
+DEPENDS = "iperf3 telemetry rbus"
+
+CFLAGS_append = " \
+    -I ${RECIPE_SYSROOT}/usr/include \
+    -I ${RECIPE_SYSROOT}/usr/include/rtmessage \
+    -I ${RECIPE_SYSROOT}/usr/include/rbus \
+    "
+
+
+do_compile() {
+        ${CC} ${S}/source/rdk-speedtest-cli.c ${CFLAGS} ${LDFLAGS} -I ${S}/include -o speedtest-client
+}
+
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 speedtest-client ${D}${bindir}/speedtest-client
+}

setup-environment-refboard-rdkb

@@ -84,6 +84,12 @@ sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_%.bbappend
 touch ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change
 fi
 
+if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-core/images/python_binary_removed ];then
+sed -i '/python/d' ${_TOPDIR}/meta-cmf-filogic/recipes-core/images/image-exclude-files.inc
+touch ${_TOPDIR}/meta-cmf-filogic/recipes-core/images/python_binary_removed
+fi
+
+
 if [ "X$FEATURE_TYPE" == "XEasyMesh" ]; then
     sed -i '/EasyMesh/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
     sed -i '/sta_manager/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc