Skip to content

Commit b65b55c

Browse files
cpokurucpokuru
authored
Merge branch 'develop' into feature/action-deploy-for/develop
2 parents 9a8d013 + dc5601a commit b65b55c

File tree

61 files changed

+1264
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1264
-586
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
DISTRO_FEATURES_append = " halVersion3"
2+
3+
#rdk-wifi-libhostap support for broadband
4+
DISTRO_FEATURES_append = " HOSTAPD_2_11"
5+
6+
# OneWifi feature
7+
DISTRO_FEATURES_append = " OneWifi"
8+
9+
# MacFilter Feature
10+
DISTRO_FEATURES_append = " acl_nl_support"
11+
12+
#No Moca Support
13+
DISTRO_FEATURES_append = " no_moca_support"
14+
DISTRO_FEATURES_append = " referencepltfm "
15+
16+
MACHINEOVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ':onewifi', '' ,d)}"
17+
18+
DISTRO_FEATURES_append = " partner_default_ext"
19+
20+
# Define extender feature
21+
DISTRO_FEATURES_append = " em_extender"
22+
DISTRO_FEATURES_append = " sdmmc"
23+
24+
# Easymesh
25+
DISTRO_FEATURES_append = " EasyMesh"
26+
DISTRO_FEATURES_append = " sta_manager"
27+
28+
#PPP Feature
29+
#DISTRO_FEATURES_append = "ppp-enabled"

‎conf/distro/include/rdk-bpi.inc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ DISTRO_FEATURES_remove = " lan0_as_wan"
4747
#Need to enable below distro once required changes are merged
4848
#DISTRO_FEATURES_append = " EasyMesh"
4949
#DISTRO_FEATURES_append = " sta_manager"
50-
PREFERRED_VERSION_go = "1.19.%"
50+
PREFERRED_VERSION_go = "1.24.%"
5151

5252
#Enable wps support
5353
DISTRO_FEATURES_append = " wps_support"
54+
55+
#Enable resource optimization
56+
DISTRO_FEATURES_append = " resource_optimization"

‎conf/include/rdk-bpi-ap-extender-bbmasks.inc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
BBMASK .= "|meta-cmf-filogic/recipes-extended/tdkb/"
2+
3+
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hostapd/', '', d)}"
4+
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hal/halinterface.bbappend', '', d)}"
5+
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"
6+
7+
BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
8+
BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-image.bb"
9+
BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-tdk-image.bb"
10+
BBMASK .= "|openembedded-core/meta/recipes-devtools/rust/"
11+
BBMASK .= "|meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend"

‎conf/include/rdk-bpi-bbmasks.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-ji
88
BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-image.bb"
99
BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-tdk-image.bb"
1010
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"
11+
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|openembedded-core/meta/recipes-devtools/rust/','',d)}"
12+
BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend','',d)}"

‎conf/layer.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BBFILE_PATTERN_cmf-bananapi := "^${LAYERDIR}/"
1212
LAYERDEPENDS_cmf-bananapi = "cmf-filogic"
1313
LAYERDEPENDS_cmf-bananapi_append = " filogic"
1414

15-
require conf/include/rdk-bpi-bbmasks.inc
16-
require conf/distro/include/rdk-bpi.inc
15+
require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/distro/include/rdk-bpi-ap-extender.inc','conf/distro/include/rdk-bpi.inc', d)}
16+
require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/include/rdk-bpi-ap-extender-bbmasks.inc','conf/include/rdk-bpi-bbmasks.inc', d)}
1717

1818
LAYERSERIES_COMPAT_cmf-bananapi = " kirkstone"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#@TYPE: Machine
2+
#@NAME: bananapi4-rdk-broadband-ap-extender
3+
#@NEEDED_BSPLAYERS: meta-cmf-bananapi
4+
#@DESCRIPTION: Machine configuration for running a RDK broadband on Banana Pi R4
5+
#@RDK_FLAVOR: rdkb
6+
7+
RUST_PANIC_STRATEGY="abort"
8+
9+
require conf/machine/filogic880-bpi-r4.conf
10+
DISTRO_FEATURES_append = " em_extender"
11+
require conf/distro/include/rdk-bpi-ap-extender.inc
12+
PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
13+
MACHINE_IMAGE_NAME = "rdk-generic-ap-extender-image"
14+
15+
#SDCARD supported changes.
16+
MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
17+
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','wic.bz2 ext4','',d)}"
18+
KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
19+
20+
WKS_FILE = " sdimage-Bananapi.wks"
21+
IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
22+
do_image_wic[recrdeps] = "do_build"
23+
#SDCARD supported Pre build bootloader
24+
do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"

‎conf/machine/bananapi4-rdk-broadband.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bana
1919
do_image_wic[recrdeps] = "do_build"
2020
#SDCARD supported Pre build bootloader
2121
do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
22+
23+
#RUST support for EasyMesh
24+
RUST_PANIC_STRATEGY="${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','abort','',d)}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ do_install_append_class-target() {
5454
sed -i "/^After=/ s/$/ ApplySystemDefaults.service /g" ${D}${systemd_unitdir}/system/RdkWanManager.service
5555
sed -i "/^After=/ s/$/ ApplySystemDefaults.service /g" ${D}${systemd_unitdir}/system/RdkVlanManager.service
5656
fi
57-
fi
57+
fi
58+
if ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender', 'true', 'false', d)}; then
59+
sed -i '/^After=CcspPandMSsp\.service$/d' ${D}${systemd_unitdir}/system/onewifi.service
60+
sed -i '$a [Install]\nWantedBy=multi-user.target' ${D}${systemd_unitdir}/system/onewifi.service
61+
fi
5862
}
5963

6064

‎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 = "5f68e4e1d965d7ceaf378a4e0bd94f8d2dcbcccd"
4+
SRCREV_libwebconfig = "5924baad3842f75f50569e73c42b80e11c0454dc"
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: 14 additions & 3 deletions
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 = "5f68e4e1d965d7ceaf378a4e0bd94f8d2dcbcccd"
7+
SRCREV_OneWifi = "5924baad3842f75f50569e73c42b80e11c0454dc"
88
DEPENDS_append = " mesh-agent "
99
DEPENDS_remove = " opensync "
1010
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
@@ -19,15 +19,26 @@ CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_M
1919
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
2020
CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
2121

22+
EXTRA_OECONF_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' ONEWIFI_CAC_APP_SUPPORT=true ', '', d)}"
23+
CFLAGS_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DONEWIFI_CAC_APP_SUPPORT -DONEWIFI_DB_SUPPORT ', '', d)}"
24+
25+
EXTRA_OECONF_append = " ONEWIFI_CSI_APP_SUPPORT=true"
26+
EXTRA_OECONF_append = " ONEWIFI_MOTION_APP_SUPPORT=true"
27+
EXTRA_OECONF_append = " ONEWIFI_HARVESTER_APP_SUPPORT=true"
28+
EXTRA_OECONF_append = " ONEWIFI_ANALYTICS_APP_SUPPORT=true"
29+
EXTRA_OECONF_append = " ONEWIFI_LEVL_APP_SUPPORT=true"
30+
EXTRA_OECONF_append = " ONEWIFI_WHIX_APP_SUPPORT=true"
31+
EXTRA_OECONF_append = " ONEWIFI_BLASTER_APP_SUPPORT=true"
32+
2233
SRC_URI += " \
2334
file://checkwifi.sh \
24-
file://onewifi_pre_start.sh \
35+
${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', bb.utils.contains('DISTRO_FEATURES', 'em_extender', 'file://onewifi_pre_start_em_ext.sh ','file://onewifi_pre_start_em_ctrl.sh ', d), 'file://onewifi_pre_start.sh ', d)} \
2536
file://wifi_defaults.txt \
2637
"
2738
do_install_append(){
2839
install -d ${D}/nvram
2940
install -m 777 ${WORKDIR}/checkwifi.sh ${D}/usr/ccsp/wifi/
30-
install -m 777 ${WORKDIR}/onewifi_pre_start.sh ${D}/usr/ccsp/wifi/
41+
install -m 777 ${WORKDIR}/onewifi_pre_*.sh ${D}/usr/ccsp/wifi/onewifi_pre_start.sh
3142
install -m 644 ${WORKDIR}/wifi_defaults.txt ${D}/nvram/
3243
}
3344

0 commit comments

Comments
 (0)