Feature rdkb scarthgap dup

conf/distro/include/rdk-bpi.inc

@@ -1,50 +1,53 @@
 # USP-PA Feature
-DISTRO_FEATURES_append = " usppa"
+DISTRO_FEATURES:append = " usppa"
 
-DISTRO_FEATURES_append = " WanManagerUnificationEnable"
+DISTRO_FEATURES:append = " WanManagerUnificationEnable"
 
-DISTRO_FEATURES_append = " rdkb_wan_manager"
+DISTRO_FEATURES:append = " rdkb_wan_manager"
 
-CFLAGS_append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '-DFEATURE_RDKB_WAN_MANAGER', '', d)}"
+CFLAGS:append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '-DFEATURE_RDKB_WAN_MANAGER', '', d)}"
 
-DISTRO_FEATURES_append = " halVersion3"
+DISTRO_FEATURES:append = " halVersion3"
 
 #rdk-wifi-libhostap support for broadband
-DISTRO_FEATURES_append = " HOSTAPD_2_11"
+DISTRO_FEATURES:append = " HOSTAPD_2_11"
 
 # OneWifi feature
-DISTRO_FEATURES_append = " OneWifi"
+DISTRO_FEATURES:append = " OneWifi"
 
 # MacFilter Feature
-DISTRO_FEATURES_append = " disable_nl80211_acl"
+DISTRO_FEATURES:append = " disable_nl80211_acl"
 
 #No Moca Support
-DISTRO_FEATURES_append = " no_moca_support"
+DISTRO_FEATURES:append = " no_moca_support"
 
-DISTRO_FEATURES_append = " referencepltfm "
+DISTRO_FEATURES:append = " referencepltfm "
 
-MACHINEOVERRIDES_append =. "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ':onewifi', '' ,d)}"
+MACHINEOVERRIDES:append =. "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ':onewifi', '' ,d)}"
 
-DISTRO_FEATURES_append = " CPUPROCANALYZER_BROADBAND"
+DISTRO_FEATURES:append = " CPUPROCANALYZER_BROADBAND"
 
 # RDKB-51565,RDKB-50795: [HAL] Cellular Hal Implementation
-DISTRO_FEATURES_append = " rdkb_cellular_manager_mm"
+DISTRO_FEATURES:append = " rdkb_cellular_manager_mm"
 
 #Dac Feature support for BPIR4 device.
-DISTRO_FEATURES_append = " dac"
+DISTRO_FEATURES:append = " dac"
 
-DISTRO_FEATURES_append = " partner_default_ext"
+DISTRO_FEATURES:append = " partner_default_ext"
 
 #Enable SDcard image as default
-DISTRO_FEATURES_append = " sdmmc"
+DISTRO_FEATURES:append = " sdmmc"
 
 #PPP Feature
-#DISTRO_FEATURES_append = "ppp-enabled"
+#DISTRO_FEATURES:append = "ppp-enabled"
 
 #disabling lan0_as_wan to allow lan0 interface to come
-DISTRO_FEATURES_remove = " lan0_as_wan"
+DISTRO_FEATURES:remove = " lan0_as_wan"
 
 #Need to enable below distro once required changes are merged 
-#DISTRO_FEATURES_append = " EasyMesh"
-#DISTRO_FEATURES_append = " sta_manager"
+#DISTRO_FEATURES:append = " EasyMesh"
+#DISTRO_FEATURES:append = " sta_manager"
 PREFERRED_VERSION_go = "1.19.%"
+PREFERRED_VERSION_wpa-supplicant = "2.11"
+PREFERRED_VERSION_zlib:scarthgap = "1.3.1"
+PREFERRED_VERSION_zlib-native:scarthgap = "1.3.1"

conf/include/rdk-bpi-bbmasks.inc

@@ -4,7 +4,8 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/rec
 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"
+BBMASK:append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
+BBMASK:append_scarthgap .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
 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)}"

conf/layer.conf

@@ -9,10 +9,11 @@ BBFILES += "\
 BBFILE_COLLECTIONS += "cmf-bananapi"
 BBFILE_PATTERN_cmf-bananapi := "^${LAYERDIR}/"
 
-LAYERDEPENDS_cmf-bananapi = "cmf-filogic"
-LAYERDEPENDS_cmf-bananapi_append = " filogic"
+LAYERDEPENDS:cmf-bananapi = "cmf-filogic"
+LAYERDEPENDS:cmf-bananapi:append = " filogic"
 
 require conf/include/rdk-bpi-bbmasks.inc
 require conf/distro/include/rdk-bpi.inc
 
-LAYERSERIES_COMPAT_cmf-bananapi = " kirkstone"
+LAYERSERIES_COMPAT:cmf-bananapi = " kirkstone scarthgap"
+BBFILE_PRIORITY_cmf-bananapi = "25"

conf/machine/bananapi4-rdk-broadband.conf

@@ -4,18 +4,26 @@
 #@DESCRIPTION: Machine configuration for running a RDK broadband on Banana Pi R4
 #@RDK_FLAVOR: rdkb
 
-require conf/machine/filogic880-bpi-r4.conf
+#require conf/machine/filogic880-bpi-r4.conf
+require conf/machine/filogic880-kernel6-6-bpi-r4.conf
 
 require conf/distro/include/rdk-bpi.inc 
 PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
 
 #SDCARD supported changes.
 MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc',' wic.bz2 ext4','',d)}"
-KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
+
+# Ensure DTBs are built and packaged
+KERNEL_DEVICETREE = "mediatek/mt7988a-bananapi-bpi-r4.dtb"
 
 WKS_FILE = " sdimage-Bananapi.wks"
-IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
+IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4.dtb ${KERNEL_IMAGETYPE}','',d)}"
 do_image_wic[recrdeps] = "do_build"
 #SDCARD supported Pre build bootloader
 do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
+
+DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable"
+
+MACHINEOVERRIDES .= ":broadband"
+KERNEL_CLASSES:remove = "itb-image"

meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb

@@ -15,14 +15,22 @@ do_configure[noexec] = "1"
 
 # also get rid of the default dependency added in bitbake.conf
 # since there is no 'main' package generated (empty)
-RDEPENDS_${PN}-dev = ""
+RDEPENDS:${PN}-dev = ""
 
-SRC_URI_append += " file://bpi-r4_sdmmc_bl2.img \
-                    file://bpi-r4_sdmmc_fip.bin"
+python do_unpack:append() {
+    import shutil, os
+    src_bl2 = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_bl2_6-6.img')
+    dst_bl2 = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_bl2_6-6.img')
+    shutil.copyfile(src_bl2, dst_bl2)
+
+    src_fip = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_fip_6-6.bin')
+    dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip_6-6.bin')
+    shutil.copyfile(src_fip, dst_fip)
+}
 
 do_deploy() {
         mkdir -p ${DEPLOYDIR}/atf/
-        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2.img ${DEPLOYDIR}/atf/
-        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip.bin ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_6-6.img ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_6-6.bin ${DEPLOYDIR}/atf/
 }
 addtask do_deploy after do_install

meta-rdk-mtk-bpir4/recipes-bsp/u-boot/u-boot_2024.01.bbappend

@@ -0,0 +1,2 @@
+
+UBOOT_CONFIG[mt7622_rfb_defconfig] = "mt7622_rfb_defconfig"

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

@@ -1,12 +1,12 @@
 include ccsp_common_bananapi.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"
-SRC_URI_append = " \
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/files:"
+SRC_URI:append = " \
                    file://gwprovapp.conf \
                 "
-CFLAGS_aarch64_append = " -Werror=format-truncation=1 "
+CFLAGS_aarch64:append = " -Werror=format-truncation=1 "
 
-do_install_append_class-target() {
+do_install:append:class-target() {
    sed -i 's#${PARODUS_START_LOG_FILE}#/rdklogs/logs/dcmrfc.log#g' ${D}${systemd_unitdir}/system/rfc.service
    sed -i 's/rfc.service /RFCbase.sh /g' ${D}${systemd_unitdir}/system/rfc.service
 
@@ -53,24 +53,30 @@ do_install_append_class-target() {
            sed -i "/^After=/ s/$/ ApplySystemDefaults.service /g" ${D}${systemd_unitdir}/system/RdkWanManager.service
            sed -i "/^After=/ s/$/ ApplySystemDefaults.service /g" ${D}${systemd_unitdir}/system/RdkVlanManager.service
        fi
-    fi 
+    fi
+    sed -i '/IsErouterRunningStatus/,/fi/ s/^/#/' ${D}/usr/ccsp/ccspPAMCPCheck.sh
 }
 
+TARGET_CFLAGS += " \
+    -Wno-error=address \
+    -Wno-error=implicit-function-declaration \
+    -Wno-error=format-truncation \
+"
 
-SYSTEMD_SERVICE_${PN}_remove_onewifi = " ccspwifiagent.service"
-SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'onewifi.service ', '', d)}"
-SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', 'webconfig.service', '', d)}"
-SYSTEMD_SERVICE_${PN} += " CcspTelemetry.service"
-SYSTEMD_SERVICE_${PN} += " notifyComp.service"
-SYSTEMD_SERVICE_${PN} += "gwprovapp.service"
-SYSTEMD_SERVICE_${PN} += "wan-initialized.target"
-SYSTEMD_SERVICE_${PN} += "wan-initialized.path"
-SYSTEMD_SERVICE_${PN}_remove = " utopia.service"
+SYSTEMD_SERVICE:${PN}:remove:onewifi = " ccspwifiagent.service"
+SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'onewifi.service', '', d)}"
+SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', 'webconfig.service', '', d)}"
+SYSTEMD_SERVICE:${PN} += "notifyComp.service"
+SYSTEMD_SERVICE:${PN} += "CcspTelemetry.service"
+SYSTEMD_SERVICE:${PN} += "gwprovapp.service"
+SYSTEMD_SERVICE:${PN} += "wan-initialized.target"
+SYSTEMD_SERVICE:${PN} += "wan-initialized.path"
+SYSTEMD_SERVICE:${PN}:remove = " utopia.service"
 
-FILES_${PN}_remove_onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
-FILES_${PN}_remove = "${systemd_unitdir}/system/utopia.service" 
-FILES_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ${systemd_unitdir}/system/onewifi.service ', '', d)}"
-FILES_${PN}_append = " \
+FILES:${PN}:remove:onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
+FILES:${PN}:remove = "${systemd_unitdir}/system/utopia.service"
+FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '${systemd_unitdir}/system/onewifi.service', '', d)}"
+FILES:${PN} += "\
    ${systemd_unitdir}/system/wan-initialized.target \
    ${systemd_unitdir}/system/wan-initialized.path \
    ${systemd_unitdir}/system/CcspTelemetry.service \

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-cr.bbappend

@@ -1,11 +1,11 @@
 include ccsp_common_bananapi.inc
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://cr-deviceprofile_bpi.xml \
 "
 
-do_install_append() {
+do_install:append() {
     # Config files and scripts
     install -m 644 ${WORKDIR}/cr-deviceprofile_bpi.xml ${D}/usr/ccsp/cr-deviceprofile.xml
     install -m 644 ${WORKDIR}/cr-deviceprofile_bpi.xml ${D}/usr/ccsp/cr-ethwan-deviceprofile.xml

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend

@@ -1,3 +1,3 @@
 include ccsp_common_bananapi.inc
 
-CFLAGS_append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '-DFEATURE_RDKB_WAN_MANAGER', '', d)}"
+CFLAGS:append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '-DFEATURE_RDKB_WAN_MANAGER', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-gwprovapp.bbappend

@@ -1,6 +1,6 @@
 include ccsp_common_bananapi.inc
 export PLATFORM_BANANAPIR4_ENABLED="yes"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     /usr/bin/gw_prov_utopia \
 "

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend

@@ -1 +1,7 @@
 include ccsp_common_bananapi.inc
+
+EXTRA_OEMAKE += "LIBS='-lrbus'"
+
+#FILES:${PN}-dev += "${libdir}/*.so"
+FILES:${PN}-dev += "${libdir}/*.so"
+INSANE_SKIP:${PN} += "dev-so"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend

@@ -1,5 +1,7 @@
 include ccsp_common_bananapi.inc
 
-CFLAGS_aarch64_append = "-Werror=format-truncation=1"
+CFLAGS_aarch64:append = "-Werror=format-truncation=1"
 
 CFLAGS += " -DDHCPV4_CLIENT_UDHCPC -DDHCPV6_CLIENT_DIBBLER -DUDHCPC_RUN_IN_BACKGROUND"
+
+FILES:${PN}-dev += "${libdir}/*.so"

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

@@ -1,26 +1,31 @@
-SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
+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 = "0344e5612aba5852cca332acb9667ffe5342a85e"
 
 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)}"
-EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
+EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"
+EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
 
 CFLAGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -Wno-error=maybe-uninitialized -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=incompatible-pointer-types -Wno-error=sign-compare -Wno-error -DEASY_MESH_NODE  ', '', d)}"
 
-CFLAGS_append = " -Wno-enum-conversion"
+CFLAGS:append = " -Wno-enum-conversion"
 
-do_compile_append() {
+do_compile:append() {
     oe_runmake -C source/platform
 }
 
-do_install_append() {
+do_install:append() {
        oe_runmake -C source/platform DESTDIR=${D} install
       install -m 644 ${S}/include/webconfig_external_proto_easymesh.h  ${D}/usr/include/ccsp
 }
 
-FILES_${PN} += " \
-    ${libdir}/libwifi_bus.so* \
+FILES:${PN} += " \
+    ${libdir}/libwifi_bus.so.* \
+"
+FILES:${PN} += " \
+    ${libdir}/*so \
 "
 
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} += "dev-so"

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

@@ -1,39 +1,54 @@
 require ccsp_common_bananapi.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+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: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 = "0344e5612aba5852cca332acb9667ffe5342a85e"
-DEPENDS_append = " mesh-agent "
-DEPENDS_remove = " opensync "
+DEPENDS:append = " mesh-agent "
+DEPENDS:remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
 
-CFLAGS_append = " -DWIFI_HAL_VERSION_3 -Wno-unused-function "
-LDFLAGS_append = " -ldl"
-CFLAGS_append_aarch64 = " -Wno-error "
+CFLAGS:append = " -DWIFI_HAL_VERSION_3 -Wno-unused-function "
+LDFLAGS:append = " -ldl"
+CFLAGS:append_aarch64 = " -Wno-error "
 
-EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_MESH_NODE ', '', d)}"
+EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
+CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_MESH_NODE ', '', d)}"
 
-EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
+EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
+CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
 
 SRC_URI += " \
     file://checkwifi.sh \
     file://onewifi_pre_start.sh \
     file://wifi_defaults.txt \
 "
-do_install_append(){
+SRC_URI:append:scarthgap = " file://msgpack_redefined_compile.patch"
+
+do_install:append(){
     install -d ${D}/nvram 
     install -m 777 ${WORKDIR}/checkwifi.sh ${D}/usr/ccsp/wifi/
     install -m 777 ${WORKDIR}/onewifi_pre_start.sh ${D}/usr/ccsp/wifi/
     install -m 644 ${WORKDIR}/wifi_defaults.txt ${D}/nvram/
 }
 
-FILES_${PN} += " \
+TARGET_CFLAGS:append = " \
+    -Wno-error=address \
+    -Wno-error=sign-compare \
+    -Wno-error=use-after-free \
+    -Wno-error=maybe-uninitialized \
+    -Wno-error=format \
+    -Wno-error=enum-int-mismatch \
+"
+FILES:${PN} += " \
     ${prefix}/ccsp/wifi/checkwifi.sh \
     ${prefix}/ccsp/wifi/onewifi_pre_start.sh \
     /usr/bin/wifi_events_consumer \
     /nvram/wifi_defaults.txt \
 "
+RDEPENDS:${PN} += "msgpack-c"
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dev:remove = "${libdir}/*.so"
+INSANE_SKIP:${PN} += "dev-so"
+

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend

@@ -1 +1,7 @@
 include ccsp_common_bananapi.inc
+
+#FILES:${PN}-dev += "${libdir}/*.so"
+INSANE_SKIP:${PN} += "dev-so"
+
+SRC_URI:remove = "file://filogic-factoryReset.patch"
+

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm.bbappend

@@ -1,10 +1,10 @@
 include ccsp_common_bananapi.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://bbhm_def_cfg_banana.xml"
+SRC_URI:append = " file://bbhm_def_cfg_banana.xml"
 
-do_install_append() {
+do_install:append() {
     # Config files and scripts
     install -d ${D}/usr/ccsp/config
     install -m 644 ${WORKDIR}/bbhm_def_cfg_banana.xml ${D}/usr/ccsp/config/bbhm_def_cfg.xml