Merge branch 'rdkcentral:develop' into easymesh_ap_profile

Author: ap934

conf/distro/include/rdk-bpi-ap-extender.inc

@@ -23,6 +23,7 @@ DISTRO_FEATURES_append = " sdmmc"
 
 # Easymesh
 DISTRO_FEATURES_append = " EasyMesh"
+DISTRO_FEATURES_append = " sta_manager"
 
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"

conf/distro/include/rdk-bpi.inc

@@ -48,3 +48,6 @@ DISTRO_FEATURES_remove = " lan0_as_wan"
 #DISTRO_FEATURES_append = " EasyMesh"
 #DISTRO_FEATURES_append = " sta_manager"
 PREFERRED_VERSION_go = "1.19.%"
+
+#Enable wps support
+DISTRO_FEATURES_append = " wps_support"

conf/include/rdk-bpi-ap-extender.bbmasks.inc renamed to conf/include/rdk-bpi-ap-extender-bbmasks.inc

@@ -8,3 +8,4 @@ BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-ji
 BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-image.bb"
 BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-tdk-image.bb"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"
+BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|openembedded-core/meta/recipes-devtools/rust/','',d)}"

conf/include/rdk-bpi-bbmasks.inc

@@ -13,6 +13,6 @@ LAYERDEPENDS_cmf-bananapi = "cmf-filogic"
 LAYERDEPENDS_cmf-bananapi_append = " filogic"
 
 require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/distro/include/rdk-bpi-ap-extender.inc','conf/distro/include/rdk-bpi.inc', d)}
-require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/include/rdk-bpi-ap-extender.bbmasks.inc','conf/include/rdk-bpi-bbmasks.inc', d)}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/include/rdk-bpi-ap-extender-bbmasks.inc','conf/include/rdk-bpi-bbmasks.inc', d)}
 
 LAYERSERIES_COMPAT_cmf-bananapi = " kirkstone"

conf/layer.conf

@@ -19,3 +19,6 @@ IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bana
 do_image_wic[recrdeps] = "do_build"
 #SDCARD supported Pre build bootloader
 do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
+
+#RUST support for EasyMesh
+RUST_PANIC_STRATEGY="${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','abort','',d)}"

conf/machine/bananapi4-rdk-broadband.conf

@@ -26,6 +26,7 @@ do_install_append_class-target() {
    install -D -m 0644 ${S}/systemd_units/wan-initialized.target ${D}${systemd_unitdir}/system/wan-initialized.target
    install -D -m 0644 ${S}/systemd_units/wan-initialized.path ${D}${systemd_unitdir}/system/wan-initialized.path
    sed -i "s/CcspCrSsp.service CcspPandMSsp.service/CcspCrSsp.service RdkWanManager.service/g" ${D}${systemd_unitdir}/system/CcspEthAgent.service
+   sed -i "/device.properties/a ExecStartPre=/bin/sh -c '(/usr/ccsp/utopiaInitCheck.sh)'"  ${D}${systemd_unitdir}/system/CcspPandMSsp.service
    DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}"
    if [ $DISTRO_WAN_ENABLED = 'true' ]; then
        sed -i "s/After=CcspCrSsp.service utopia.service PsmSsp.service CcspEthAgent.service/After=CcspCrSsp.service PsmSsp.service/g" ${D}${systemd_unitdir}/system/RdkWanManager.service

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend

@@ -1,7 +1,7 @@
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
 
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
-SRCREV_libwebconfig = "0344e5612aba5852cca332acb9667ffe5342a85e"
+SRCREV_libwebconfig = "850296b0a26daa25e5849176baaf289b6017b519"
 
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
-SRCREV_OneWifi = "0344e5612aba5852cca332acb9667ffe5342a85e"
+SRCREV_OneWifi = "850296b0a26daa25e5849176baaf289b6017b519"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
@@ -19,6 +19,17 @@ CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_M
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
 CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
 
+EXTRA_OECONF_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' ONEWIFI_CAC_APP_SUPPORT=true ', '', d)}"
+CFLAGS_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DONEWIFI_CAC_APP_SUPPORT -DONEWIFI_DB_SUPPORT  ', '', d)}"
+
+EXTRA_OECONF_append = " ONEWIFI_CSI_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_MOTION_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_HARVESTER_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_ANALYTICS_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_LEVL_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_WHIX_APP_SUPPORT=true"
+EXTRA_OECONF_append = " ONEWIFI_BLASTER_APP_SUPPORT=true"
+
 SRC_URI += " \
     file://checkwifi.sh \
     file://onewifi_pre_start.sh \

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

@@ -11,4 +11,10 @@ do_install_append () {
                    install -m 0755 ${S}/jst/actionHandler/ajaxSet_wizard_step2_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wizard_step2.jst
                    install -m 0755 ${S}/jst/actionHandler/ajaxSet_wps_config_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wps_config.jst
                 fi
+                sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g"  ${D}/usr/www2/actionHandler/ajax_managed_devices.jst
+                sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g"  ${D}/usr/www2/actionHandler/ajax_managed_services.jst
+                sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g"  ${D}/usr/www2/actionHandler/ajax_port_forwarding.jst
+                sed -i "/getInstanceIDs(\"Device.Hosts.Host.\")/a \$hostIDs=\$hostIDs[count(\$hostIDs)-2];" ${D}/usr/www2/managed_devices_add_computer_allowed.jst
+                sed -i "/getInstanceIDs(\"Device.Hosts.Host.\")/a \$hostIDs=\$hostIDs[count(\$hostIDs)-2];" ${D}/usr/www2/managed_devices_add_computer_blocked.jst
+                sed -i "s/\$clients_RSSI\[strtoupper(\$Host\[\$i.toString()\]\['PhysAddress'\])\]/\$Host\[\$i\]\['X_CISCO_COM_RSSI'\]/g" ${D}/usr/www2/connected_devices_computers.jst
 }