Merge branch 'develop' into speedtest-changes

Author: anatar818

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

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/hal_interface.patch

@@ -6,7 +6,7 @@
 #Signed-off-by:[email protected]
 ################################################
 diff --git a/wifi_hal_ap.h b/wifi_hal_ap.h
-index f5c37db..7daf939 100644
+index f5c37db..9f3f732 100644
 --- a/wifi_hal_ap.h
 +++ b/wifi_hal_ap.h
 @@ -349,7 +349,8 @@ typedef enum
@@ -19,7 +19,17 @@ index f5c37db..7daf939 100644
  } wifi_neighborScanMode_t;
 
  /**
-@@ -2736,6 +2737,14 @@ typedef struct {
+@@ -2711,7 +2712,9 @@ typedef struct {
+ typedef struct {
+     BOOL mld_enable;
+     UINT mld_id;
++    UINT mld_link_id;
+     mac_address_t mld_addr;
++    BOOL mld_apply;
+ } __attribute__((packed)) wifi_mld_common_info_t;
+ 
+ typedef struct {
+@@ -2736,6 +2739,14 @@ typedef struct {
  } __attribute__((packed)) wifi_back_haul_sta_t;
 
  #define WIFI_AP_MAX_SSID_LEN    33
@@ -30,20 +40,20 @@ index f5c37db..7daf939 100644
 + * Computed by taking Max MPDU size - ~ MAX 802.11 header size - 802.11 FCS size - ~Size of required IEs
 + * 2,310 is divisible by the typical Vendor IE size (7 = IE Type[1] + IE Length[1] + OUI[3] + VIE Type[1] + VIE Subtype [1])
 + */
-+#define WIFI_AP_MAX_VENDOR_IE_LEN 2310	
++#define WIFI_AP_MAX_VENDOR_IE_LEN 2310
  typedef struct {
      CHAR    ssid[WIFI_AP_MAX_SSID_LEN];
      BOOL    enabled;
-@@ -2763,6 +2772,8 @@ typedef struct {
+@@ -2762,6 +2773,8 @@ typedef struct {
+     mac_address_t bssid;                    /**< The BSSID. This variable should only be used in the get API. It can't used to change the interface MAC */
      UINT   wmmNoAck;
      UINT   wepKeyLength;
-     BOOL   bssHotspot;
 +    UINT   vendor_elements_len;
 +    UCHAR  vendor_elements[WIFI_AP_MAX_VENDOR_IE_LEN];
+     BOOL   bssHotspot;
      UINT   wpsPushButton;
      char   beaconRateCtl[32];
-     BOOL   network_initiated_greylist;
-@@ -2919,4 +2930,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
+@@ -2919,4 +2932,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
  }
  #endif
 

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 = "c24ac486aaed208c4deb4df1a040864c0712f487"
+SRCREV_rdk-wifi-hal = "384def11912712f0184740f10607d60be0064743"
 
 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 = "c24ac486aaed208c4deb4df1a040864c0712f487"
+SRCREV_rdk-wifi-util = "384def11912712f0184740f10607d60be0064743"

meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend

@@ -31,7 +31,7 @@ fi
 #Defaults for Telemetry T2 Enable
 \$T2Enable=true
 \$T2Version=2.0.1
-\$T2ConfigURL=https://xconf.rdkcentral.com:19092/loguploader/getT2Settings"  >> ${D}${sysconfdir}/utopia/system_defaults
+\$T2ConfigURL=https://xconf.rdkcentral.com/loguploader/getT2Settings"  >> ${D}${sysconfdir}/utopia/system_defaults
 
 #lan0 used for WAN Connectivity
 sed -i "s/\$\$lan_ethernet_physical_ifnames=lan0 lan1 lan2 lan3 lan4/\$\$lan_ethernet_physical_ifnames=lan1 lan2 lan3 lan4/g" ${D}${sysconfdir}/utopia/system_defaults

meta-rdk-mtk-bpir4/recipes-common/rfc/rfc_git.bbappend

@@ -1,4 +1,4 @@
 do_install_append() {
         #Set the RFC_CONFIG_SERVER_URL by sed
-        sed -i -e 's/RFC_CONFIG_SERVER_URL=.*$/RFC_CONFIG_SERVER_URL=https:\/\/xconf.rdkcentral.com:19092\/featureControl\/getSettings/' ${D}${sysconfdir}/rfc.properties
+        sed -i -e 's/RFC_CONFIG_SERVER_URL=.*$/RFC_CONFIG_SERVER_URL=https:\/\/xconf.rdkcentral.com\/featureControl\/getSettings/' ${D}${sysconfdir}/rfc.properties
 }

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

@@ -6,7 +6,10 @@ 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"
 
 ROOTFS_POSTPROCESS_COMMAND_append = "add_busybox_fixes; "
 

meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend

@@ -18,4 +18,8 @@ do_install_append () {
    install -m 0755 ${S}/devicebpi/scripts/self_heal_connectivity_test.sh ${D}/usr/ccsp/tad
    install -m 0755 ${S}/devicebpi/scripts/resource_monitor.sh ${D}/usr/ccsp/tad
    install -m 0755 ${S}/devicebpi/scripts/task_health_monitor.sh ${D}/usr/ccsp/tad
+
+   # Changing CLOUDURL and DCM_LOG_SERVER_URL values with migrated server
+   sed -i -e 's|^CLOUDURL=.*$|CLOUDURL="https://xconf.rdkcentral.com/xconf/swu/stb?eStbMac="|' ${D}${sysconfdir}/include.properties
+   sed -i -e 's|^DCM_LOG_SERVER_URL=.*$|DCM_LOG_SERVER_URL=https://xconf.rdkcentral.com/loguploader/getSettings|' ${D}${sysconfdir}/dcm.properties
 }