Merge branch 'rdkcentral:develop' into easymesh_ap_profile

Author: ap934

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

@@ -18,8 +18,11 @@ MACHINEOVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ':
 DISTRO_FEATURES_append = " partner_default_ext"
 
 # Define extender feature
-DISTRO_FEATURES_append = " extender"
+DISTRO_FEATURES_append = " em_extender"
 DISTRO_FEATURES_append = " sdmmc"
 
+# Easymesh
+DISTRO_FEATURES_append = " EasyMesh"
+
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"

conf/distro/include/rdk-bpi.inc

@@ -46,4 +46,5 @@ DISTRO_FEATURES_remove = " lan0_as_wan"
 
 #Need to enable below distro once required changes are merged 
 #DISTRO_FEATURES_append = " EasyMesh"
+#DISTRO_FEATURES_append = " sta_manager"
 PREFERRED_VERSION_go = "1.19.%"

conf/layer.conf

@@ -12,7 +12,7 @@ BBFILE_PATTERN_cmf-bananapi := "^${LAYERDIR}/"
 LAYERDEPENDS_cmf-bananapi = "cmf-filogic"
 LAYERDEPENDS_cmf-bananapi_append = " filogic"
 
-require ${@bb.utils.contains('DISTRO_FEATURES', 'extender','conf/distro/include/rdk-bpi-ap-extender.inc','conf/distro/include/rdk-bpi.inc', d)}
-require ${@bb.utils.contains('DISTRO_FEATURES', '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/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)}
 
 LAYERSERIES_COMPAT_cmf-bananapi = " kirkstone"

conf/machine/bananapi4-rdk-broadband-ap-extender.conf

@@ -5,7 +5,7 @@
 #@RDK_FLAVOR: rdkb
 
 require conf/machine/filogic880-bpi-r4.conf
-DISTRO_FEATURES_append = " extender"
+DISTRO_FEATURES_append = " em_extender"
 require conf/distro/include/rdk-bpi-ap-extender.inc 
 PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
 MACHINE_IMAGE_NAME = "rdk-generic-ap-extender-image"

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

@@ -54,7 +54,7 @@ do_install_append_class-target() {
            sed -i "/^After=/ s/$/ ApplySystemDefaults.service /g" ${D}${systemd_unitdir}/system/RdkVlanManager.service
        fi
     fi
-   if ${@bb.utils.contains('DISTRO_FEATURES', 'extender', 'true', 'false', d)}; then
+   if ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender', 'true', 'false', d)}; then
    sed -i '/^After=CcspPandMSsp\.service$/d' ${D}${systemd_unitdir}/system/onewifi.service
    sed -i '$a [Install]\nWantedBy=multi-user.target' ${D}${systemd_unitdir}/system/onewifi.service
    fi

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.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 = "3962d0b1f141bc1f00ef81ff25c2a36bcd5cf4e2"
+SRCREV_libwebconfig = "0344e5612aba5852cca332acb9667ffe5342a85e"
 
 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.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 = "3962d0b1f141bc1f00ef81ff25c2a36bcd5cf4e2"
+SRCREV_OneWifi = "0344e5612aba5852cca332acb9667ffe5342a85e"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
@@ -16,6 +16,9 @@ CFLAGS_append_aarch64 = " -Wno-error "
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
 CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_MESH_NODE ', '', d)}"
 
+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)}"
+
 SRC_URI += " \
     file://checkwifi.sh \
     file://onewifi_pre_start.sh \

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start.sh

@@ -14,12 +14,7 @@ iw phy phy0 interface add wifi2 type __ap
 
 #Obtain the wifi0 mac address
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2`
-#Strip the : and increment mac by 1 to get wifi1 macaddress
-#mac=$(echo $wifi0_mac | tr -d ':')
-#mac_incr=$((0x$mac + 1))
 wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2`
-#Increment again by 1 to get wifi2 address
-#mac_incr=$(($mac_incr + 1))
 wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
 #print the mac address
 echo $wifi0_mac

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

@@ -1,7 +1,7 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
 
 SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
-SRCREV_rdk-wifi-hal = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"
+SRCREV_rdk-wifi-hal = "c24ac486aaed208c4deb4df1a040864c0712f487"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY "
 CFLAGS_append_kirkstone = " -fcommon"

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend

@@ -1,4 +1,4 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
 
 SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
-SRCREV_rdk-wifi-util = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"
+SRCREV_rdk-wifi-util = "c24ac486aaed208c4deb4df1a040864c0712f487"