Merge branch 'develop' into modify_spdtest_client_bin

Author: cpokuru

conf/include/rdk-bpi-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/machine/bananapi4-rdk-broadband.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)}"

meta-rdk-mtk-bpir4/recipes-connectivity/socat/socat_%.bbappend

@@ -0,0 +1,19 @@
+EXTRA_OECONF_remove = " --disable-proxy \
+                --disable-tun \
+                --disable-stdio \
+                --disable-sctp \
+                --disable-socks4 \
+                --disable-socks4a \
+                --disable-udp \
+                --disable-fdnum \
+                --disable-creat \
+                --disable-gopen \
+                --disable-pipe \
+                --disable-unix \
+                --disable-abstract-unixsocket \
+                --disable-rawip \
+                --disable-genericsocket \
+                --disable-system \
+                --disable-readline \
+"
+

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

@@ -28,4 +28,4 @@ add_busybox_fixes() {
 }
 
 IMAGE_INSTALL_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ppp-enabled', '', 'pptp-linux rp-pppoe xl2tpd', d)}"
-IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh',' unified-wifi-mesh unified-wifi-mesh-cli','',d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh',' unified-wifi-mesh unified-wifi-mesh-cli socat','',d)}"