Merge branch 'develop' into make_wpa3_default

Author: anatar818

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

@@ -4,7 +4,7 @@ DISTRO_FEATURES_append = " halVersion3"
 DISTRO_FEATURES_append = " HOSTAPD_2_11"
 
 # OneWifi feature
-DISTRO_FEATURES_append = " OneWifi"
+DISTRO_FEATURES_append = " OneWifi onewifi_integration"
 
 # MacFilter Feature
 DISTRO_FEATURES_append = " acl_nl_support"
@@ -26,5 +26,8 @@ DISTRO_FEATURES_append = " EasyMesh"
 DISTRO_FEATURES_append = " sta_manager"
 DISTRO_FEATURES_append = " with_alsap" 
 
+# MLO
+DISTRO_FEATURES_append = " CONFIG_IEEE80211BE"
+DISTRO_FEATURES_append = " generic_mlo"
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"

conf/include/rdk-bpi-bbmasks.inc

@@ -11,3 +11,4 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|openembedded-core/meta/recipes-devtools/rust/','',d)}"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend','',d)}"
 BBMASK .= "|meta-cmf-filogic/recipes-ccsp/util/utopia-headers.bb"
+BBMASK .= "|meta-cmf-filogic/recipes-ccsp/hal/halinterface.bbappend"

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

@@ -17,7 +17,7 @@ MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','wic.bz2 ext4','',d)}"
 KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
 
-WKS_FILE = " sdimage-Bananapi.wks"
+WKS_FILE = " ${@bb.utils.contains('DISTRO_FEATURES','EasyMesh',' sdimage-EM-Bananapi.wks',' sdimage-Bananapi.wks',d)}"
 IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
 do_image_wic[recrdeps] = "do_build"
 #SDCARD supported Pre build bootloader

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-adv-security.bbappend

@@ -1 +1,4 @@
 include ccsp_common_bananapi.inc
+
+EXTRA_OEMAKE += "'SSP_LDFLAGS=${SSP_LDFLAGS}'"
+SSP_LDFLAGS = " -lhal_platform"

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

@@ -7,6 +7,12 @@ SRC_URI_append = " \
 CFLAGS_aarch64_append = " -Werror=format-truncation=1 "
 
 do_install_append_class-target() {
+   install -D -m 0644 ${S}/systemd_units/parodus.service ${D}${systemd_unitdir}/system/parodus.service
+   install -D -m 0644 ${S}/systemd_units/webpa.service ${D}${systemd_unitdir}/system/webpa.service
+   sed -i 's/parodusCmd.cmd &/parodusCmd.cmd/' ${D}${systemd_unitdir}/system/parodus.service
+   sed -i '/ExecStart=/a ExecStartPost\=\sysevent set webserver started'  ${D}${systemd_unitdir}/system/parodus.service 
+   sed -i "/WorkingDirectory=/a ExecStartPre\=\/bin/sh -c '\/lib/rdk/webpa_pre_setup.sh'\\;" ${D}${systemd_unitdir}/system/webpa.service
+
    sed -i 's#${PARODUS_START_LOG_FILE}#/rdklogs/logs/dcmrfc.log#g' ${D}${systemd_unitdir}/system/rfc.service
    sed -i 's/rfc.service /RFCbase.sh /g' ${D}${systemd_unitdir}/system/rfc.service
 
@@ -30,6 +36,8 @@ do_install_append_class-target() {
    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
+       install -D -m 0644 ${S}/systemd_units/CcspAdvSecuritySsp.service ${D}${systemd_unitdir}/system/CcspAdvSecuritySsp.service
+       sed -i "s/wan-initialized.target/multi-user.target/g" ${D}${systemd_unitdir}/system/CcspAdvSecuritySsp.service
     fi
     #Telemetry support
    install -D -m 0644 ${S}/systemd_units/CcspTelemetry.service ${D}${systemd_unitdir}/system/CcspTelemetry.service
@@ -47,6 +55,10 @@ do_install_append_class-target() {
 
    #SNMP SUPPORT
    sed -i "/tcp\:192.168.254.253\:705/a  ExecStart=\/usr\/bin\/snmp_subagent \&" ${D}${systemd_unitdir}/system/snmpSubAgent.service
+
+   #Updating the checkfilogicwifisupport.service
+   sed -i "s/forking/oneshot/g"  ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
+   sed -i "/ExecStart=/i RemainAfterExit=yes" ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
 
    if ${@bb.utils.contains('DISTRO_FEATURES', 'partner_default_ext', 'true', 'false', d)}; then
        sed -i "/^After=.*/a Requires=ApplySystemDefaults.service " ${D}${systemd_unitdir}/system/CcspPandMSsp.service
@@ -71,7 +83,10 @@ SYSTEMD_SERVICE_${PN} += " notifyComp.service"
 SYSTEMD_SERVICE_${PN} += "gwprovapp.service"
 SYSTEMD_SERVICE_${PN} += "wan-initialized.target"
 SYSTEMD_SERVICE_${PN} += "wan-initialized.path"
+SYSTEMD_SERVICE_${PN} += "parodus.service"
+SYSTEMD_SERVICE_${PN} += "webpa.service"
 SYSTEMD_SERVICE_${PN}_remove = " utopia.service"
+SYSTEMD_SERVICE_${PN} += " CcspAdvSecuritySsp.service"
 
 FILES_${PN}_remove_onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
 FILES_${PN}_remove = "${systemd_unitdir}/system/utopia.service" 
@@ -83,4 +98,7 @@ FILES_${PN}_append = " \
    ${systemd_unitdir}/system/notifyComp.service \
    ${systemd_unitdir}/system/gwprovapp.service \
    ${systemd_unitdir}/system/gwprovapp.service.d/gwprovapp.conf \
+   ${systemd_unitdir}/system/parodus.service \
+   ${systemd_unitdir}/system/webpa.service \
+   ${systemd_unitdir}/system/CcspAdvSecuritySsp.service \
    "

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 = "aceb3e7d7fd5dfb8eceadc5af92ba81c98c83e30"
+SRCREV_libwebconfig = "0ff4e4323043775d09e363df71959707c7666853"
 
 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 = "aceb3e7d7fd5dfb8eceadc5af92ba81c98c83e30"
+SRCREV_OneWifi = "0ff4e4323043775d09e363df71959707c7666853"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

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

@@ -9,6 +9,7 @@ iw phy phy0 interface add wifi1.1 type __ap
 iw phy phy0 interface add wifi1.2 type __ap
 iw phy phy0 interface add wifi1.3 type __ap
 iw phy phy0 interface add wifi2 type __ap
+iw phy phy0 interface add mld0 type __ap radios all
 
 #Obtain the wifi mac address
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
@@ -48,4 +49,14 @@ ifconfig wifi1.2 up
 ifconfig wifi1.3 up
 ifconfig wifi2 up
 
+# Set MLD interface address as wifi2 MAC address + 1
+prefix="${wifi2_mac%:*}"
+last_byte="${wifi2_mac##*:}"
+
+new_byte=$(printf "%02X" $(( (0x$last_byte + 1) & 0xFF )))
+new_mac="$prefix:$new_byte"
+
+ip link set dev "mld0" down
+ip link set dev "mld0" address "$new_mac"
+
 exit 0

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

@@ -9,6 +9,7 @@ iw phy phy0 interface add wifi1.1 type __ap
 iw phy phy0 interface add wifi1.2 type __ap
 iw phy phy0 interface add wifi1.3 type __ap
 iw phy phy0 interface add wifi2 type __ap
+iw phy phy0 interface add mld0 type __ap radios all
 
 #Obtain the wifi mac address
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
@@ -48,6 +49,16 @@ ifconfig wifi1.2 up
 ifconfig wifi1.3 up
 ifconfig wifi2 up
 
+# Set MLD interface address as wifi2 MAC address + 1
+prefix="${wifi2_mac%:*}"
+last_byte="${wifi2_mac##*:}"
+
+new_byte=$(printf "%02X" $(( (0x$last_byte + 1) & 0xFF )))
+new_mac="$prefix:$new_byte"
+
+ip link set dev "mld0" down
+ip link set dev "mld0" address "$new_mac"
+
 #To update al_mac addr in EasymesgCfg.json
 al_mac_addr=`cat /nvram/EasymeshCfg.json | grep AL_MAC_ADDR  | cut -d '"' -f4`
 al_mac=`iw dev wifi1.3 info | grep addr | cut -d ' ' -f2`

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend

@@ -3,33 +3,21 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/parodus2ccsp:"
 SRC_URI += "\
     file://parodus_read_file.sh \
     file://parodus_create_file.sh \
+    file://webpa_pre_setup.sh \
 "
-SRC_URI_append = " \
-    ${CMF_GIT_ROOT}/rdk/devices/raspberrypi/webpa-client;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/devices;name=rdkbbpi \
-"
-SRCREV_rdkbbpi = "${AUTOREV}"
-do_fetch[vardeps] += "SRCREV_rdkbbpi"
-SRCREV_FORMAT .= "_rdkbbpi"
-
-inherit systemd coverity
-
 EXTRA_OECMAKE += "-DBUILD_BANANAPI_R4=ON "
 
 do_install_append () {
-    install -d ${D}${systemd_unitdir}/system
     install -d ${D}${base_libdir_native}/rdk
-    install -m 0644 ${S}/devices/broadband/parodus2ccsp/systemd/webpabroadband.service ${D}${systemd_unitdir}/system
-    install -m 0755 ${S}/devices/broadband/parodus2ccsp/scripts/webpa_pre_setup.sh ${D}${base_libdir_native}/rdk
+    install -m 0755 ${WORKDIR}/webpa_pre_setup.sh ${D}${base_libdir_native}/rdk
     install -d ${D}/etc/parodus
     install -m 777 ${WORKDIR}/parodus_read_file.sh ${D}/etc/parodus/
     install -m 777 ${WORKDIR}/parodus_create_file.sh ${D}/etc/parodus/
 
 }
 
-SYSTEMD_SERVICE_${PN}_append = " webpabroadband.service"
 
 FILES_${PN}_append = " \
-     ${systemd_unitdir}/system/webpabroadband.service \
      ${base_libdir_native}/rdk/* \
      /etc/parodus/* \
      "