Merge branch 'develop' into rdkbaccl_344

pganna856 · web-flow · commit be7a93cc9d79 · 2025-10-24T08:59:31.000+05:30
diff --git a/conf/include/rdk-bpi-bbmasks.inc b/conf/include/rdk-bpi-bbmasks.inc
@@ -1,7 +1,6 @@
 BBMASK .= "|meta-cmf-filogic/recipes-extended/tdkb/"
 
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hostapd/', '', d)}"
-BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hal/halinterface.bbappend', '', d)}"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"
 
 BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
@@ -11,5 +10,6 @@ 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"
+BBMASK .= "|meta-filogic/recipes-wifi/hal/halinterface.bbappend"
 BBMASK .= "|meta-rdk-ext/recipes-telephony/asterisk/asterisk_18.5.0.bb"
-BBMASK .= "|meta-cmf-filogic/recipes-ccsp/hal/halinterface.bbappend"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend b/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 = "0ff4e4323043775d09e363df71959707c7666853"
+SRCREV_libwebconfig = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
 
 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)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend b/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 = "0ff4e4323043775d09e363df71959707c7666853"
+SRCREV_OneWifi = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/0002-Add-EHT-support.patch b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/0002-Add-EHT-support.patch
@@ -0,0 +1,17 @@
+SOURCE:mediatek
+
+diff --git a/include/wifi_hal_generic.h b/include/wifi_hal_generic.h
+index b81ad05..2a6f33e 100644
+--- a/include/wifi_hal_generic.h
++++ b/include/wifi_hal_generic.h
+@@ -328,7 +328,9 @@ typedef enum{
+     WIFI_CHANNELBANDWIDTH_80MHZ = 0x4,
+     WIFI_CHANNELBANDWIDTH_160MHZ = 0x8,
+     WIFI_CHANNELBANDWIDTH_80_80MHZ = 0x10,
+-    WIFI_CHANNELBANDWIDTH_320MHZ = 0x20
++    WIFI_CHANNELBANDWIDTH_320MHZ = 0x20,
++    WIFI_CHANNELBANDWIDTH_320_1MHZ = 0x40,
++    WIFI_CHANNELBANDWIDTH_320_2MHZ = 0x80
+ } wifi_channelBandwidth_t;
+ 
+ /**
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/sta-network-wifiagent.patch b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/sta-network-wifiagent.patch
@@ -0,0 +1,113 @@
+From 68113170930788e52f8fa6089a2882dc28f5693f Mon Sep 17 00:00:00 2001
+From: Simon Chung <simon.c.chung@accenture.com>
+Date: Thu, 2 Sep 2021 15:44:57 +0100
+Subject: [PATCH] sta-network
+
+Change-Id: Idaae3038a352e94d1f2810a8d73b7f77c8e47309
+---
+ wifi_hal.h | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 91 insertions(+)
+
+diff --git a/include/wifi_hal.h b/include/wifi_hal.h
+index 579418e..d284af4 100644
+--- a/include/wifi_hal.h
++++ b/include/wifi_hal.h
+@@ -110,4 +110,95 @@
+ * APIs to be deprecated. Not add new function or structure!
+ */
+ #include "wifi_hal_deprecated.h"
++
++/* DRAFT FOR CLIENT API */
++
++
++/* APPROACH 1*/
++typedef enum wifi_sta_network_flags {
++ WIFI_STA_NET_F_OPEN,
++ WIFI_STA_NET_F_PSK1,
++ WIFI_STA_NET_F_PSK2,WIFI_STA_NET_F_PSK_FT,
++ WIFI_STA_NET_F_AES,
++ WIFI_STA_NET_F_TKIP,
++ WIFI_STA_NET_F_4ADDR_MULTI_AP, /* future: easymesh's wds */
++ WIFI_STA_NET_F_OWE, /* future: opportunistic wireless encryption */
++ WIFI_STA_NET_F_SAE, /* future: wpa3 */
++} wifi_sta_network_flags_t;
++typedef enum wifi_sta_multi_ap_flag {
++ WIFI_STA_MULTI_AP_NOT_SUPPORTED,
++        WIFI_STA_MULTI_AP_NONE,
++        WIFI_STA_MULTI_AP_BHAUL_STA,
++} wifi_sta_multi_ap_flag_t;
++
++
++typedef struct wifi_sta_network {
++        int id;
++ char bridge[16]; /* valid for 4addr_multi_ap */
++ char ssid[32];
++ char psk[128];
++ char bssid[6]; /* 00:00:00:00:00:00 means any */
++ size_t ssid_len;
++ size_t psk_len;
++        int multi_ap;
++        char pairwise[64]; 
++        char proto[64];
++        char key_mgmt[64];
++ unsigned long flags; /* enum wifi_sta_network_flags */
++} wifi_sta_network_t;
++
++typedef struct wifi_sta_network_state {
++ struct wifi_sta_network desired_network;
++ char current_bssid[6]; /* 00:00:00:00:00:00 means disconnected */
++ int last_deauth_reason;
++ int last_disassoc_reason;
++} wifi_sta_network_state_t;
++
++typedef void (*wifi_sta_network_cb)(INT radioIndex, void *ctx);
++INT wifi_setStaNetwork(INT radioIndex, const wifi_sta_network_t *network);
++INT wifi_setStaNetworkSetEventCallback(INT radioIndex, wifi_sta_network_cb *cb, void *ctx);
++INT wifi_getStaNetworkState(INT radioIndex, wifi_sta_network_state_t *state);
++INT wifi_getStaNetworkCapabilities(INT radioIndex, INT *flags);
++
++/* APPROACH 2 */
++typedef struct {
++ CHAR ssid[33];
++ CHAR bssid[17];
++ CHAR passphrase[65];
++} wifi_staNetwork_t;
++
++INT wifi_getSTANetworks(INT apIndex, wifi_sta_network_t **out_staNetworks_array, INT out_array_size, BOOL *out_scan_cur_freq);
++
++INT wifi_setSTANetworks(INT apIndex, wifi_sta_network_t **staNetworks_array, INT array_size, BOOL scan_cur_freq);
++
++INT wifi_delSTANetworks(INT apIndex);
++
++
++/* notdefined approach */
++INT wifi_getSTANumberOfEntries(ULONG *output);
++INT wifi_getSTARadioIndex(INT ssidIndex, INT *radioIndex);
++INT wifi_getSTAName(INT apIndex, CHAR *output_string);
++INT wifi_getSTABSSID(INT ssidIndex, CHAR *output_string);
++INT wifi_getSTASSID(INT ssidIndex, CHAR *output_string);
++INT wifi_getSTAMAC(INT ssidIndex, CHAR *output_string);
++INT wifi_getSTAEnabled(INT ssidIndex, BOOL *enabled);
++INT wifi_setSTAEnabled(INT ssidIndex, BOOL enabled);
++
++typedef struct _wifi_client_associated_dev
++{
++        UCHAR MACAddress[6];                /**< The MAC address of an associated device. */
++        INT NetworkID;         /**< Network ID */
++        INT connected;         /**< If network is connected */
++        INT reason;
++        INT locally_generated;
++} wifi_client_associated_dev_t;       
++
++typedef INT ( * wifi_client_event_callback)(INT apIndex, wifi_client_associated_dev_t *state);
++
++void wifi_client_event_callback_register(wifi_client_event_callback callback_proc);
++INT wifi_getApChannel(INT radioIndex,ULONG *output_ulong);   //RDKB
++
++INT wifi_setApChannel(INT radioIndex, ULONG channel);        //RDKB  //AP only
++
++
+ #endif
+-- 
+2.28.0
+
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend b/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 = "ae219ea5ec614a28d4e06e222c1da4444aaf2b5f"
+SRCREV_rdk-wifi-hal = "7cbf2c7a892e9d10be0fc8fa3ad85c7a7aeb511c"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY -DCONFIG_HW_CAPABILITIES "
 
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-halif.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-halif.bbappend
@@ -1,8 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+  
+SRC_URI_remove_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=main"
+SRC_URI_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=develop"
+SRCREV_onewifi = "5e98c960363bd79027775101cbd9d11c5e9d6c26"
 
-SRC_URI_remove = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=main"
-SRC_URI += "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=develop"
-
-SRCREV = "33b416471090929422a0b03a6a76d5bf5a36eb3a"
-
-SRC_URI += "file://sta-network.patch"
+SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://sta-network-wifiagent.patch', d)}"
+SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://0002-Add-EHT-support.patch', d)}"
+SRC_URI_onewifi += " file://sta-network.patch"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend b/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 = "ae219ea5ec614a28d4e06e222c1da4444aaf2b5f"
+SRCREV_rdk-wifi-util = "7cbf2c7a892e9d10be0fc8fa3ad85c7a7aeb511c"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/unified-wifi-mesh/unified-wifi-mesh-header.bb b/meta-rdk-mtk-bpir4/recipes-ccsp/unified-wifi-mesh/unified-wifi-mesh-header.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0b1ae637439c7d6f4487fb90163c79a"
 
 SRC_URI = "git://github.com/rdkcentral/unified-wifi-mesh.git;branch=main;protocol=https;name=Unified-wifi-mesh_header"
 PV = "git${SRCPV}"
-SRCREV_Unified-wifi-mesh_header = "2e29a9cf63a3de4c4e385a08c714486e60e6a06c"
+SRCREV_Unified-wifi-mesh_header = "0e441b6668a0f882cb884d63e089b8a6fbfea3f5"
 SRCREV_FORMAT = "Unified-wifi-mesh_header"
 S = "${WORKDIR}/git"
 
diff --git a/meta-rdk-mtk-bpir4/recipes-connectivity/ucode/ucode_git.bbappend b/meta-rdk-mtk-bpir4/recipes-connectivity/ucode/ucode_git.bbappend
@@ -0,0 +1,5 @@
+DEPENDS_remove = "ubus uci"
+EXTRA_OECMAKE += " \
+    -DUBUS_SUPPORT=OFF \
+    -DUCI_SUPPORT=OFF \
+"
diff --git a/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/files/0001-remove-ubus-on-rdkb.patch b/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/files/0001-remove-ubus-on-rdkb.patch
@@ -0,0 +1,53 @@
+diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
+index da471c9b8..a1a442403 100644
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -7999,7 +7999,7 @@ struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
+ 	}
+ #endif /* CONFIG_P2P */
+ 
+-	wpas_ubus_add_bss(wpa_s);
++	//wpas_ubus_add_bss(wpa_s);
+ 	wpas_ucode_add_bss(wpa_s);
+ 
+ 	return wpa_s;
+@@ -8029,7 +8029,7 @@ int wpa_supplicant_remove_iface(struct wpa_global *global,
+ #endif /* CONFIG_MESH */
+ 
+ 	wpas_ucode_free_bss(wpa_s);
+-	wpas_ubus_free_bss(wpa_s);
++	//wpas_ubus_free_bss(wpa_s);
+ 
+ 	/* Remove interface from the global list of interfaces */
+ 	prev = global->ifaces;
+diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
+index 1c1e69d3b..3532b5803 100644
+--- a/wpa_supplicant/wpa_supplicant_i.h
++++ b/wpa_supplicant/wpa_supplicant_i.h
+@@ -21,7 +21,7 @@
+ #include "config_ssid.h"
+ #include "wmm_ac.h"
+ #include "pasn/pasn_common.h"
+-#include "ubus.h"
++//#include "ubus.h"
+ #include "ucode.h"
+ 
+ extern const char *const wpa_supplicant_version;
+@@ -322,7 +322,7 @@ struct wpa_global {
+ 
+ 	struct psk_list_entry *add_psk; /* From group formation */
+ 
+-	struct ubus_object ubus_global;
++	//struct ubus_object ubus_global;
+ };
+ 
+ 
+@@ -697,7 +697,7 @@ struct wpa_supplicant {
+ 	unsigned char own_addr[ETH_ALEN];
+ 	unsigned char perm_addr[ETH_ALEN];
+ 	char ifname[100];
+-	struct wpas_ubus_bss ubus;
++	//struct wpas_ubus_bss ubus;
+ 	struct wpas_ucode_bss ucode;
+ #ifdef CONFIG_MATCH_IFACE
+ 	int matched;
diff --git a/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
@@ -1,14 +1,24 @@
 EXTRA_OEMAKE = "CONFIG_BUILD_WPA_CLIENT_SO=y"
 FILES_SOLIBSDEV = ""
-do_install_append () {
-	install -d ${D}${includedir}
-	install -d ${D}${libdir}
-	install -d ${D}/lib/rdk/
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-	install -m 0777 ${S}/wpa_supplicant/libwpa_client.so  ${D}${libdir}/
-	install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/
+DEPENDS_remove += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'ubus udebug', '', d)}"
+SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' file://0001-remove-ubus-on-rdkb.patch', '', d)}"
+do_configure:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'true', 'false', d)}; then
+        sed -i 's/^CONFIG_UBUS=y/# CONFIG_UBUS is not set/' ${S}/wpa_supplicant/.config
+        sed -i 's/^CONFIG_UCODE=y/# CONFIG_UCODE is not set/' ${S}/wpa_supplicant/.config
+    fi
 }
 
+do_install_append () {
+        install -d ${D}${includedir}
+        install -d ${D}${libdir}
+        install -d ${D}/lib/rdk/
+
+        install -m 0777 ${S}/wpa_supplicant/libwpa_client.so  ${D}${libdir}/
+        install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/
+}
 FILES_${PN} += "${libdir}/libwpa_client.so"
 FILES_${PN} += "${includedir}/wpa_ctrl.h"
 FILES_${PN} += "lib/rdk"
diff --git a/meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend b/meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend
@@ -66,3 +66,4 @@ do_filogic_gen_image(){
 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 socat','',d)}"
 IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'with_alsap',' ieee1905-em ','',d)}"
+IMAGE_INSTALL_remove += " mtkhnat-util"
diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-logan.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-logan.bbappend
@@ -0,0 +1,4 @@
+RDEPENDS_packagegroup-filogic-logan_remove += " iwinfo \
+                                             uci \
+					ubus \
+"
diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend
@@ -5,3 +5,7 @@ RDEPENDS_packagegroup-filogic-mt76_remove_onewifi = " \
                     vts \
 "
 RDEPENDS_packagegroup-filogic-mt76_remove_broadband = " mt76-test"
+RDEPENDS_packagegroup-filogic-mt76_remove += " iwinfo \
+                                          uci \
+					ubus \
+"
diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-firmware_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-firmware_%.bbappend
@@ -0,0 +1,7 @@
+#Remove duplicate package installation in populate sdk
+do_install_append() {
+                rm -rf ${D}${base_libdir}/firmware/mediatek/mt7996
+                rm -rf ${D}${base_libdir}/firmware/mediatek/mt7988
+                rm -rf ${D}${base_libdir}/firmware/mediatek/mt7996/mt7996*
+}
+
diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb
@@ -90,6 +90,11 @@ sed -i '/python/d' ${_TOPDIR}/meta-cmf-filogic/recipes-core/images/image-exclude
 touch ${_TOPDIR}/meta-cmf-filogic/recipes-core/images/python_binary_removed
 fi
 
+if [ ! -e ${_TOPDIR}/meta-filogic/recipes-wifi/hal/mt76_hal_change ];then
+echo "DEPENDS += \"rdk-wifi-halif\"" >> ${_TOPDIR}/meta-filogic/recipes-wifi/hal/hal-wifi-mt76.bb
+echo "DEPENDS += \"rdk-wifi-halif\"" >> ${_TOPDIR}/meta-cmf-broadband/recipes-ccsp/hal/hal-wifi-cfg80211_git.bb
+touch ${_TOPDIR}/meta-filogic/recipes-wifi/hal/mt76_hal_change
+fi
 
 if [ "X$FEATURE_TYPE" == "XEasyMesh" ]; then
     sed -i '/EasyMesh/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
@@ -107,6 +112,7 @@ fi
 
 if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
     sed -i '/kernel6-6/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
+    echo 'RDEPENDS:${PN}-dev = ""' >> ${_TOPDIR}/meta-filogic/recipes-kernel/linux6-6-libc-headers/linux-libc-headers.inc
 fi
 
 if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then
