Skip to content

Commit db705df

Browse files
authored
Merge pull request #163 from kpandu987/RDKBACCL-742_stamgr
RDKBACCL-742 : dummy sta_mgr files inclusion in onewifi for demo tasks
2 parents 06fd881 + 44e6d02 commit db705df

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

conf/distro/include/rdk-bpi.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ DISTRO_FEATURES_remove = " lan0_as_wan"
4646

4747
#Need to enable below distro once required changes are merged
4848
#DISTRO_FEATURES_append = " EasyMesh"
49+
#DISTRO_FEATURES_append = " sta_manager"
4950
PREFERRED_VERSION_go = "1.19.%"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
22

33
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
4-
SRCREV_libwebconfig = "4acc4b4633a70e1bd19d8ed4f08f1585ecce8415"
4+
SRCREV_libwebconfig = "9b113eb7af912ee25c6a87086545e16b8a59fc8d"
55

66
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
77
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
44

55
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
66
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
7-
SRCREV_OneWifi = "4acc4b4633a70e1bd19d8ed4f08f1585ecce8415"
7+
SRCREV_OneWifi = "9b113eb7af912ee25c6a87086545e16b8a59fc8d"
88
DEPENDS_append = " mesh-agent "
99
DEPENDS_remove = " opensync "
1010
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
@@ -16,6 +16,9 @@ CFLAGS_append_aarch64 = " -Wno-error "
1616
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
1717
CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_MESH_NODE ', '', d)}"
1818

19+
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
20+
CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
21+
1922
SRC_URI += " \
2023
file://checkwifi.sh \
2124
file://onewifi_pre_start.sh \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
22

33
SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
4-
SRCREV_rdk-wifi-hal = "a5d0c49e61b744fcc9ec86e48c73c155b4df8533"
4+
SRCREV_rdk-wifi-hal = "c24ac486aaed208c4deb4df1a040864c0712f487"
55

66
CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_ -DBANANA_PI_PORT -DFEATURE_SINGLE_PHY "
77
CFLAGS_append_kirkstone = " -fcommon"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
22

33
SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
4-
SRCREV_rdk-wifi-util = "a5d0c49e61b744fcc9ec86e48c73c155b4df8533"
4+
SRCREV_rdk-wifi-util = "c24ac486aaed208c4deb4df1a040864c0712f487"

setup-environment-refboard-rdkb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ fi
8686

8787
if [ "X$FEATURE_TYPE" == "XEasyMesh" ]; then
8888
sed -i '/EasyMesh/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
89+
sed -i '/sta_manager/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
8990
fi
9091

9192
if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then

0 commit comments

Comments
 (0)