From 29f289bb264a811c10f1b89b265853d73b3564f0 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Thu, 31 Jul 2025 17:20:44 +0000 Subject: [PATCH 01/43] RDKBACCL-1002 : Set bitbake symbols, DISTRO, kernel_6.6 --- conf/distro/include/rdk-bpi.inc | 40 +++++++++---------- conf/include/rdk-bpi-bbmasks.inc | 3 +- conf/layer.conf | 6 +-- .../trusted-firmware-a/bootloader_prebuild.bb | 2 +- .../ccsp/ccsp-common-library.bbappend | 20 +++++----- .../recipes-ccsp/ccsp/ccsp-cr.bbappend | 6 +-- .../recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend | 2 +- .../recipes-ccsp/ccsp/ccsp-misc.bbappend | 2 +- .../ccsp/ccsp-one-wifi-libwebconfig.bbappend | 12 +++--- .../recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 24 +++++------ .../recipes-ccsp/ccsp/ccsp-psm.bbappend | 6 +-- .../recipes-ccsp/ccsp/ccsp-snmp-pa.bbappend | 6 +-- .../recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend | 2 +- .../recipes-ccsp/ccsp/ccsp-webui-jst.bbappend | 2 +- .../ccsp/ccsp_common_bananapi.inc | 24 +++++------ .../recipes-ccsp/ccsp/cpeabs_1.0.bbappend | 2 +- .../recipes-ccsp/ccsp/parodus2ccsp.bbappend | 10 ++--- .../hal/hal-ethsw-generic_git.bbappend | 6 +-- .../hal/hal-platform-generic_git.bbappend | 8 ++-- .../hal/hal-wifi-generic_git.bbappend | 16 ++++---- .../recipes-ccsp/hal/halinterface.bbappend | 4 +- .../recipes-ccsp/hal/rdk-wifi-hal.bbappend | 16 ++++---- .../recipes-ccsp/hal/rdk-wifi-util.bbappend | 2 +- .../rdk-wifi-libhostap.bbappend | 22 +++++----- .../recipes-ccsp/util/utopia.bbappend | 4 +- .../crashupload/crashupload_git.bbappend | 2 +- .../lighttpd/lighttpd_1.4.53.bbappend | 3 ++ .../mesh-agent/mesh-agent.bbappend | 2 +- .../recipes-common/rfc/rfc_git.bbappend | 2 +- .../dibbler/dibbler_git.bbappend | 2 +- .../wpa-supplicant/wpa-supplicant_%.bbappend | 2 +- .../glibc/glibc-locale_%.bbappend | 2 +- .../rdk-generic-broadband-image.bbappend | 14 +++---- .../packagegroup-filogic-mt76.bbappend | 2 +- .../packagegroup-rdk-ccsp-broadband.bbappend | 6 +-- .../packagegroup-rdk-oss-broadband.bbappend | 2 +- .../init-filogic/init-filogic.bbappend | 6 +-- .../recipes-extended/cobalt/cobalt_%.bbappend | 1 + .../iptables/iptables_1.8.7.bbappend | 6 +-- .../macaddress/bpi-macaddress.bb | 2 +- .../serialnumber/bpi-serialnumber.bb | 6 +-- .../linux/kernel-devsrc.bbappend | 2 +- .../linux/linux-mediatek_%.bbappend | 4 +- .../recipes-netsys/eip-197/eip-197.bbappend | 4 +- .../recipes-netsys/pce/pce.bbappend | 4 +- .../opensync/opensync_%.bbappend | 6 +-- .../cpuprocanalyzer_git.bbappend | 4 +- .../sysint-broadband.bbappend | 4 +- .../recipes-rdkb/usp-pa/usp-pa.bbappend | 3 +- .../parodus/parodus_1.0.bbappend | 10 ++--- .../webcfg/webcfg_1.0.bbappend | 8 ++-- setup-environment-refboard-rdkb | 2 +- 52 files changed, 182 insertions(+), 176 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-extended/cobalt/cobalt_%.bbappend diff --git a/conf/distro/include/rdk-bpi.inc b/conf/distro/include/rdk-bpi.inc index a36ddbbb..f91c66c7 100644 --- a/conf/distro/include/rdk-bpi.inc +++ b/conf/distro/include/rdk-bpi.inc @@ -1,50 +1,50 @@ # 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.%" diff --git a/conf/include/rdk-bpi-bbmasks.inc b/conf/include/rdk-bpi-bbmasks.inc index 117912c7..7d7824d7 100644 --- a/conf/include/rdk-bpi-bbmasks.inc +++ b/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)}" diff --git a/conf/layer.conf b/conf/layer.conf index 02c62d57..22406806 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,10 +9,10 @@ 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" diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index e476cbaf..bd98fe71 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -17,7 +17,7 @@ do_configure[noexec] = "1" # since there is no 'main' package generated (empty) RDEPENDS_${PN}-dev = "" -SRC_URI_append += " file://bpi-r4_sdmmc_bl2.img \ +SRC_URI:append += " file://bpi-r4_sdmmc_bl2.img \ file://bpi-r4_sdmmc_fip.bin" do_deploy() { diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index eeb2d9e4..2e64134a 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/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 @@ -57,7 +57,7 @@ do_install_append_class-target() { } -SYSTEMD_SERVICE_${PN}_remove_onewifi = " ccspwifiagent.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} += " CcspTelemetry.service" @@ -65,12 +65,12 @@ 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 = " 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}:append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ${systemd_unitdir}/system/onewifi.service ', '', d)}" +FILES_${PN}:append = " \ ${systemd_unitdir}/system/wan-initialized.target \ ${systemd_unitdir}/system/wan-initialized.path \ ${systemd_unitdir}/system/CcspTelemetry.service \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-cr.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-cr.bbappend index 9293de71..5b26885c 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-cr.bbappend +++ b/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 diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend index 2490902f..daf3dd00 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend +++ b/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)}" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend index 81d1cfca..40967269 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend @@ -1,5 +1,5 @@ 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" 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 index c27e1c10..c02c2383 100644 --- 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,21 +1,21 @@ -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 } 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 index eff00d30..d5219c13 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -1,30 +1,30 @@ 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(){ +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/ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm.bbappend index eb19f5cc..bb628518 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm.bbappend +++ b/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 diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-snmp-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-snmp-pa.bbappend index b558d708..898b9fa2 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-snmp-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-snmp-pa.bbappend @@ -1,12 +1,12 @@ include ccsp_common_bananapi.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://snmpd.conf \ " -do_install_append(){ +do_install:append(){ install -m 0664 ${WORKDIR}/snmpd.conf ${D}/usr/ccsp/snmp/ sed -i "s/Ccsp_SA-RG-MIB-MoCA.xml<\/mibFile>/<\!--Ccsp_SA-RG-MIB-MoCA.xml<\/mibFile>-->/g" ${D}/usr/ccsp/snmp/CcspMibList.xml sed -i "s/Ccsp_RDKB-RG-MIB-MoCA.xml<\/mibFile>/<\!--Ccsp_RDKB-RG-MIB-MoCA.xml<\/mibFile>-->/g" ${D}/usr/ccsp/snmp/CcspRDKBMibList.xml diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend index 18e4e37e..67facc23 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend @@ -2,7 +2,7 @@ include ccsp_common_bananapi.inc LDFLAGS += "-Wl,--no-as-needed -lulog" -do_install_append () { +do_install:append () { # Config files and scripts install -m 644 ${S}/config/ccsp_tr069_pa_certificate_cfg_arm.xml ${D}/usr/ccsp/tr069pa/ccsp_tr069_pa_certificate_cfg.xml install -m 644 ${S}/config/ccsp_tr069_pa_cfg_arm.xml ${D}/usr/ccsp/tr069pa/ccsp_tr069_pa_cfg.xml diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend index fa65920f..5bda6917 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend @@ -1,6 +1,6 @@ include ccsp_common_bananapi.inc -do_install_append () { +do_install:append () { if ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'true', 'false', d)}; then install -m 0755 ${S}/../xb6/jst/wireless_network_configuration_onewifi.jst ${D}/usr/www2/wireless_network_configuration.jst install -m 0755 ${S}/../xb6/jst/wireless_network_configuration_edit_onewifi.jst ${D}/usr/www2/wireless_network_configuration_edit.jst diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp_common_bananapi.inc b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp_common_bananapi.inc index b077fa6e..0f5aa42a 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp_common_bananapi.inc +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp_common_bananapi.inc @@ -1,20 +1,20 @@ SUMMARY = "common inc for Banana Pi" -CFLAGS_remove = " -D_PLATFORM_TURRIS_ " -CFLAGS_append += " -D_COSA_INTEL_USG_ARM_ -D_COSA_FOR_COMCAST_ -D_COSA_BCM_ARM_ -DCONFIG_VENDOR_CUSTOMER_COMCAST " -CFLAGS_append += " -D_PLATFORM_BANANAPI_R4_ " -CFLAGS_append += " -DWAN_FAILOVER_SUPPORTED" -CFLAGS_append += " -DRBUS_BUILD_FLAG_ENABLE" -CFLAGS_append += " -DWAN_MANAGER_UNIFICATION_ENABLED" -CFLAGS_append += " -DFEATURE_SUPPORT_RDKLOG" -CFLAGS_append += " -DRBUS_BUILD_INTEGRATED" +CFLAGS:remove = " -D_PLATFORM_TURRIS_ " +CFLAGS:append += " -D_COSA_INTEL_USG_ARM_ -D_COSA_FOR_COMCAST_ -D_COSA_BCM_ARM_ -DCONFIG_VENDOR_CUSTOMER_COMCAST " +CFLAGS:append += " -D_PLATFORM_BANANAPI_R4_ " +CFLAGS:append += " -DWAN_FAILOVER_SUPPORTED" +CFLAGS:append += " -DRBUS_BUILD_FLAG_ENABLE" +CFLAGS:append += " -DWAN_MANAGER_UNIFICATION_ENABLED" +CFLAGS:append += " -DFEATURE_SUPPORT_RDKLOG" +CFLAGS:append += " -DRBUS_BUILD_INTEGRATED" -CFLAGS_append += " ${@bb.utils.contains('DISTRO_FEATURES', 'WanFailOverSupportEnable', ' -DWAN_FAILOVER_SUPPORTED -DRBUS_BUILD_FLAG_ENABLE', '', d)}" -CFLAGS_append += " ${@bb.utils.contains('DISTRO_FEATURES', 'WanManagerUnificationEnable', '-DWAN_MANAGER_UNIFICATION_ENABLED', '', d)}" -CFLAGS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}" +CFLAGS:append += " ${@bb.utils.contains('DISTRO_FEATURES', 'WanFailOverSupportEnable', ' -DWAN_FAILOVER_SUPPORTED -DRBUS_BUILD_FLAG_ENABLE', '', d)}" +CFLAGS:append += " ${@bb.utils.contains('DISTRO_FEATURES', 'WanManagerUnificationEnable', '-DWAN_MANAGER_UNIFICATION_ENABLED', '', d)}" +CFLAGS:append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}" DEPENDS += "breakpad-wrapper" LDFLAGS += "-lbreakpadwrapper" -LDFLAGS_append = " -lpthread -lcrypto" +LDFLAGS:append = " -lpthread -lcrypto" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/cpeabs_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/cpeabs_1.0.bbappend index 5eed607f..33623188 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/cpeabs_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/cpeabs_1.0.bbappend @@ -1 +1 @@ -CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', '-D_PLATFORM_BANANAPI_R4_', '', d)}" +CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', '-D_PLATFORM_BANANAPI_R4_', '', d)}" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend index de4f0d9e..1968a07a 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/parodus2ccsp:" +FILESEXTRAPATHS:prepend := "${THISDIR}/parodus2ccsp:" SRC_URI += "\ file://parodus_read_file.sh \ file://parodus_create_file.sh \ " -SRC_URI_append = " \ +SRC_URI:append = " \ ${CMF_GIT_ROOT}/rdk/devices/raspberrypi/webpa-client;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/devices;name=rdkbbpi \ " SRCREV_rdkbbpi = "${AUTOREV}" @@ -15,7 +15,7 @@ inherit systemd coverity EXTRA_OECMAKE += "-DBUILD_BANANAPI_R4=ON " -do_install_append () { +do_install:append () { install -d ${D}${systemd_unitdir}/system install -d ${D}${base_libdir_native}/rdk install -m 0644 ${S}/devices/broadband/parodus2ccsp/systemd/webpabroadband.service ${D}${systemd_unitdir}/system @@ -26,9 +26,9 @@ do_install_append () { } -SYSTEMD_SERVICE_${PN}_append = " webpabroadband.service" +SYSTEMD_SERVICE_${PN}:append = " webpabroadband.service" -FILES_${PN}_append = " \ +FILES_${PN}:append = " \ ${systemd_unitdir}/system/webpabroadband.service \ ${base_libdir_native}/rdk/* \ /etc/parodus/* \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend index 78c1d9ab..5fc77728 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -CFLAGS_append += " -D_PLATFORM_BANANAPI_R4_ " -SRC_URI_append += "file://Add_interface_Changes.patch" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +CFLAGS:append += " -D_PLATFORM_BANANAPI_R4_ " +SRC_URI:append += "file://Add_interface_Changes.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-platform-generic_git.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-platform-generic_git.bbappend index c0886624..c2f9620f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-platform-generic_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-platform-generic_git.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " file://Add_ipv6_changes.patch" -SRC_URI_append = " file://bpi_serial_no_fix.patch" +SRC_URI:append = " file://Add_ipv6_changes.patch" +SRC_URI:append = " file://bpi_serial_no_fix.patch" -do_configure_append() { +do_configure:append() { #For trimming the spaces sed -i "s/cat \/proc\/device-tree\/model/cat \/proc\/device-tree\/model | tr -d ' '/g" ${S}/rdkb_hal/src/platform/platform_hal.c } diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend index 4646f653..f95e026b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend @@ -1,14 +1,14 @@ -SRC_URI_append = " \ +SRC_URI:append = " \ ${CMF_GIT_ROOT}/rdkb/devices/raspberrypi/hal;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/source/wifi/devices_bpi;name=wifihal-bananapi \ " SRCREV_wifihal-bananapi = "${AUTOREV}" -DEPENDS_append =" libev wpa-supplicant" -DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' rdk-wifi-hal', '', d)}" -LDFLAGS_append = " -lev -lwpa_client -lpthread" +DEPENDS:append =" libev wpa-supplicant" +DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' rdk-wifi-hal', '', d)}" +LDFLAGS:append = " -lev -lwpa_client -lpthread" -do_configure_prepend(){ +do_configure:prepend(){ rm ${S}/wifi_hal.c rm ${S}/Makefile.am ln -sf ${S}/devices_bpi/source/wifi/wifi_hal.c ${S}/wifi_hal.c @@ -26,13 +26,13 @@ do_configure_prepend(){ sed -i "s/wlan%d/wifi%d/g" ${S}/rpi_wifi_hal_assoc_devices_details.c } -do_install_append(){ +do_install:append(){ install -d ${D}/usr/bin install -m 777 ${B}/wifihal ${D}/usr/bin/ } -CFLAGS_append = " -DWIFI_HAL_VERSION_3 " -CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' -D_ONE_WIFI_ ', '', d)}" +CFLAGS:append = " -DWIFI_HAL_VERSION_3 " +CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' -D_ONE_WIFI_ ', '', d)}" RDEPENDS_${PN} += "wpa-supplicant" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/halinterface.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/halinterface.bbappend index 2795a3a1..abdea5d2 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/halinterface.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/halinterface.bbappend @@ -1,5 +1,5 @@ -CFLAGS_append = " -DWIFI_HAL_VERSION_3" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +CFLAGS:append = " -DWIFI_HAL_VERSION_3" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://hal_interface.patch;apply=no " #need to remove this patch once this changes merged in rdk-next 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 index 68b774f3..9ab491e4 100644 --- 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,15 +1,15 @@ -SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal" +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 = "c24ac486aaed208c4deb4df1a040864c0712f487" -CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_ -DBANANA_PI_PORT -DFEATURE_SINGLE_PHY " -CFLAGS_append_kirkstone = " -fcommon" -CFLAGS_remove = "-DCONFIG_MBO" -EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ONE_WIFIBUILD=true ', '', d)}" -EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' BANANA_PI_PORT=true ', '', d)}" +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DBANANA_PI_PORT -DFEATURE_SINGLE_PHY " +CFLAGS:append_kirkstone = " -fcommon" +CFLAGS:remove = "-DCONFIG_MBO" +EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ONE_WIFIBUILD=true ', '', d)}" +EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' BANANA_PI_PORT=true ', '', d)}" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \   file://InterfaceMap.json \ @@ -17,7 +17,7 @@ SRC_URI += " \ " # Install InterfaceMap.json in /nvram -do_install_append() { +do_install:append() { install -d ${D}/nvram install -m 0644 ${WORKDIR}/InterfaceMap.json ${D}/nvram/InterfaceMap.json install -m 0644 ${WORKDIR}/EasymeshCfg.json ${D}/nvram 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 index 35791941..fbc0d35a 100644 --- 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: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 = "c24ac486aaed208c4deb4df1a040864c0712f487" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 46c690fb..581a789b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -1,22 +1,22 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -LIC_FILES_CHKSUM_remove = "file://source/hostap-2.10/README;md5=e3d2f6c2948991e37c1ca4960de84747" +LIC_FILES_CHKSUM:remove = "file://source/hostap-2.10/README;md5=e3d2f6c2948991e37c1ca4960de84747" LIC_FILES_CHKSUM = "file://source/hostap-2.11/README;md5=6e4b25e7d74bfc44a32ba37bdf5210a6" -SRC_URI_remove = " file://Rpi_rdkwifilibhostap_changes.patch" -SRC_URI_remove = " file://fixed_6G_wrong_freq.patch" -SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_10', 'file://2.10/wpa3_compatibility_hostap_2_10.patch', '', d)}" -SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/Bpi_rdkwifilibhostap_2_11_changes.patch', 'file://2.10/Bpi_rdkwifilibhostap_2_10_changes.patch', d)}" -SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" -SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" +SRC_URI:remove = " file://Rpi_rdkwifilibhostap_changes.patch" +SRC_URI:remove = " file://fixed_6G_wrong_freq.patch" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_10', 'file://2.10/wpa3_compatibility_hostap_2_10.patch', '', d)}" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/Bpi_rdkwifilibhostap_2_11_changes.patch', 'file://2.10/Bpi_rdkwifilibhostap_2_10_changes.patch', d)}" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS " -do_configure_prepend() { +do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ } -do_install_append() { +do_install:append() { install -d ${D}${includedir}/rdk-wifi-libhostap/wpa_supplicant/ install -m 0755 ${S}/source/hostap-${HOSTAPD_PV}/wpa_supplicant/*.h ${D}${includedir}/rdk-wifi-libhostap/wpa_supplicant } diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index 19caceeb..8b9514b4 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -1,10 +1,10 @@ include meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp_common_bananapi.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://service_bridge_bpi.sh" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/ install -d ${D}${sysconfdir}/utopia/ diff --git a/meta-rdk-mtk-bpir4/recipes-common/crashupload/crashupload_git.bbappend b/meta-rdk-mtk-bpir4/recipes-common/crashupload/crashupload_git.bbappend index ff2c8d59..b897989d 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/crashupload/crashupload_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/crashupload/crashupload_git.bbappend @@ -1,5 +1,5 @@ -do_install_append () { +do_install:append () { sed -i '/After=network-online.target/d' ${D}${systemd_unitdir}/system/coredump-upload.path sed -i '/Requires=network-online.target/d' ${D}${systemd_unitdir}/system/coredump-upload.path } diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend new file mode 100644 index 00000000..149c111e --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend @@ -0,0 +1,3 @@ +SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " +SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " + diff --git a/meta-rdk-mtk-bpir4/recipes-common/mesh-agent/mesh-agent.bbappend b/meta-rdk-mtk-bpir4/recipes-common/mesh-agent/mesh-agent.bbappend index 36e7f5f2..c2cba997 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/mesh-agent/mesh-agent.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/mesh-agent/mesh-agent.bbappend @@ -1 +1 @@ -CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_ " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ " diff --git a/meta-rdk-mtk-bpir4/recipes-common/rfc/rfc_git.bbappend b/meta-rdk-mtk-bpir4/recipes-common/rfc/rfc_git.bbappend index e21204af..8a71be83 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/rfc/rfc_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/rfc/rfc_git.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { #Set the RFC_CONFIG_SERVER_URL by sed sed -i -e 's/RFC_CONFIG_SERVER_URL=.*$/RFC_CONFIG_SERVER_URL=https:\/\/xconf.rdkcentral.com:19092\/featureControl\/getSettings/' ${D}${sysconfdir}/rfc.properties } diff --git a/meta-rdk-mtk-bpir4/recipes-connectivity/dibbler/dibbler_git.bbappend b/meta-rdk-mtk-bpir4/recipes-connectivity/dibbler/dibbler_git.bbappend index e9e3c74e..6920973f 100644 --- a/meta-rdk-mtk-bpir4/recipes-connectivity/dibbler/dibbler_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-connectivity/dibbler/dibbler_git.bbappend @@ -1,5 +1,5 @@ #To avoid multiple installation -do_install_append() { +do_install:append() { if [ -f ${D}${sysconfdir}/udhcpc.vendor_specific ]; then rm -rf ${D}${sysconfdir}/udhcpc.vendor_specific fi 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 index cd8d5b71..4b37c498 100644 --- 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,6 +1,6 @@ EXTRA_OEMAKE = "CONFIG_BUILD_WPA_CLIENT_SO=y" FILES_SOLIBSDEV = "" -do_install_append () { +do_install:append () { install -d ${D}${includedir} install -d ${D}${libdir} install -d ${D}/lib/rdk/ diff --git a/meta-rdk-mtk-bpir4/recipes-core/glibc/glibc-locale_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/glibc/glibc-locale_%.bbappend index 212028a5..0e62574f 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/glibc/glibc-locale_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/glibc/glibc-locale_%.bbappend @@ -1,5 +1,5 @@ #To avoid do_package_qa issue for files not shipped but installed. -do_install_append() { +do_install:append() { # Remove empty dirs in libdir when gconv or locales are not copied find ${D}${libdir} -type d -empty -delete } 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 index 619afca1..7a044fe0 100644 --- 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 @@ -1,12 +1,12 @@ #WebPA Feature -IMAGE_INSTALL_append = " parodus parodus2ccsp" +IMAGE_INSTALL:append = " parodus parodus2ccsp" #TR069 Feature -IMAGE_INSTALL_append = " ccsp-tr069-pa" -IMAGE_INSTALL_append = " bpi-serialnumber" -IMAGE_INSTALL_append = " bpi-macaddress" +IMAGE_INSTALL:append = " ccsp-tr069-pa" +IMAGE_INSTALL:append = " bpi-serialnumber" +IMAGE_INSTALL:append = " bpi-macaddress" -ROOTFS_POSTPROCESS_COMMAND_append = "add_busybox_fixes; " +ROOTFS_POSTPROCESS_COMMAND:append = "add_busybox_fixes; " #Emptying the PRSERV_HOST since builds are local PRSERV_HOST = "" @@ -22,5 +22,5 @@ add_busybox_fixes() { fi } -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: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)}" 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 index a84a86d9..ad78a1b9 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_packagegroup-filogic-mt76_remove_onewifi = " \ +RDEPENDS_packagegroup-filogic-mt76:remove_onewifi = " \ hostapd \ usteer \ wifi-test-tool \ diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend index f2a1baca..9a7c7ada 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend @@ -1,9 +1,9 @@ -RDEPENDS_packagegroup-rdk-ccsp-broadband_remove = " rdk-wifi-hal" +RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = " rdk-wifi-hal" -RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " \ +RDEPENDS_packagegroup-rdk-ccsp-broadband:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'rdk-wifi-hal', '' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', 'cpuprocanalyzer', ' ', d)} \ " GWPROVAPP = "${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','ccsp-gwprovapp', '' ,d)}" -RDEPENDS_packagegroup-rdk-ccsp-broadband_append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_cellular_manager_mm', ' rdk-cellularmanager-mm', ' ', d)}" +RDEPENDS_packagegroup-rdk-ccsp-broadband:append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_cellular_manager_mm', ' rdk-cellularmanager-mm', ' ', d)}" diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend index 72a3438d..2f3d754f 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_packagegroup-rdk-oss-broadband_append = " \ +RDEPENDS_packagegroup-rdk-oss-broadband:append = " \ evtest \ " diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index bec9acc0..a4d2548f 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -1,4 +1,4 @@ -do_install_append(){ +do_install:append(){ install -d ${D}${sbindir} sed -i '/brctl addif brlan0 lan0/d' ${D}${sbindir}/init-bridge.sh @@ -20,7 +20,7 @@ fi' ${D}${sbindir}/init-bridge.sh } #ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone -SYSTEMD_SERVICE:${PN}_remove = "usb-mount@.service" -do_install_append_broadband () { +SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" +do_install:append_broadband () { rm ${D}${systemd_unitdir}/system/usb-mount@.service } diff --git a/meta-rdk-mtk-bpir4/recipes-extended/cobalt/cobalt_%.bbappend b/meta-rdk-mtk-bpir4/recipes-extended/cobalt/cobalt_%.bbappend new file mode 100644 index 00000000..550fd127 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-extended/cobalt/cobalt_%.bbappend @@ -0,0 +1 @@ +SRCREV_FORMAT = "depot_tools_wayland_cobalt" diff --git a/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend index fde97a78..05ae856a 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend @@ -1,7 +1,7 @@ -RRECOMMENDS_${PN}_append += "kernel-module-xt-nat \ +RRECOMMENDS_${PN}:append += "kernel-module-xt-nat \ kernel-module-ipt-trigger" -FILESEXTRAPATHS_prepend:="${THISDIR}/files:" +FILESEXTRAPATHS:prepend:="${THISDIR}/files:" -SRC_URI_append = "file://0001-add-port-triggering-support.patch" +SRC_URI:append = "file://0001-add-port-triggering-support.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb b/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb index 19cd1f39..906a2150 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb +++ b/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rdkcentral/broadband-utils.git;branch=main;protocol= S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" -CXXFLAGS_append = " -DAARCH64_BUILD" +CXXFLAGS:append = " -DAARCH64_BUILD" do_compile() { diff --git a/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb b/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb index 3ff498c4..66119ee3 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb +++ b/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb @@ -3,14 +3,14 @@ SUMMARY = "Update the serial number" LICENSE="Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" -inherit autotools ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)} systemd +inherit autotools ${@bb.utils.contains_any("DISTRO_FEATURES", "kirkstone scarthgap", "python3native", "pythonnative", d)} systemd SRC_URI = "git://github.com/rdkcentral/broadband-utils.git;branch=main;protocol=https;" S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" -CFLAGS_append += " -DAARCH64_BUILD" +CFLAGS:append += " -DAARCH64_BUILD" do_compile() { ${CC} ${S}/rdkmmap/source/*.c ${LDFLAGS} ${CFLAGS} -I ${S}/rdkmmap/include -o rdkmmap @@ -24,5 +24,5 @@ do_install() { #SYSTEMD_SERVICE_${PN} += " rdkmmap.service" -#FILES_${PN}_append = "${systemd_unitdir}/system/rdkmmap.service" +#FILES_${PN}:append = "${systemd_unitdir}/system/rdkmmap.service" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/kernel-devsrc.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/kernel-devsrc.bbappend index 2844db4b..3bc4412b 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/kernel-devsrc.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/kernel-devsrc.bbappend @@ -1 +1 @@ -RDEPENDS:${PN}_remove = " gcc-plugins libmpc-dev" +RDEPENDS:${PN}:remove = " gcc-plugins libmpc-dev" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 9094f6e1..a9338fec 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://0001-add-support-for-port-triggering.patch" SRC_URI += "file://BPI-resolving-port-triggering-errors.patch" @@ -13,4 +13,4 @@ SRC_URI += " \ file://rdkb_cfg/wps_key.cfg \ " -CMDLINE_append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" +CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" diff --git a/meta-rdk-mtk-bpir4/recipes-netsys/eip-197/eip-197.bbappend b/meta-rdk-mtk-bpir4/recipes-netsys/eip-197/eip-197.bbappend index 39925725..75cc9d57 100644 --- a/meta-rdk-mtk-bpir4/recipes-netsys/eip-197/eip-197.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-netsys/eip-197/eip-197.bbappend @@ -1,2 +1,2 @@ -SRC_URI_remove = "git://gerrit.mediatek.inc/openwrt/feeds/mtk_openwrt_feeds;protocol=https;branch=master;destsuffix=git" -SRC_URI_append = " git://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds;protocol=https;branch=master;destsuffix=git" +SRC_URI:remove = "git://gerrit.mediatek.inc/openwrt/feeds/mtk_openwrt_feeds;protocol=https;branch=master;destsuffix=git" +SRC_URI:append = " git://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds;protocol=https;branch=master;destsuffix=git" diff --git a/meta-rdk-mtk-bpir4/recipes-netsys/pce/pce.bbappend b/meta-rdk-mtk-bpir4/recipes-netsys/pce/pce.bbappend index 39925725..75cc9d57 100644 --- a/meta-rdk-mtk-bpir4/recipes-netsys/pce/pce.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-netsys/pce/pce.bbappend @@ -1,2 +1,2 @@ -SRC_URI_remove = "git://gerrit.mediatek.inc/openwrt/feeds/mtk_openwrt_feeds;protocol=https;branch=master;destsuffix=git" -SRC_URI_append = " git://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds;protocol=https;branch=master;destsuffix=git" +SRC_URI:remove = "git://gerrit.mediatek.inc/openwrt/feeds/mtk_openwrt_feeds;protocol=https;branch=master;destsuffix=git" +SRC_URI:append = " git://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds;protocol=https;branch=master;destsuffix=git" diff --git a/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend b/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend index c72120b0..5604d7ff 100644 --- a/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" OPENSYNC_VENDOR_URI = "git://github.com/rdkcentral/opensync-vendor-rdk-rpi.git;protocol=${CMF_GIT_PROTOCOL};branch=main;name=vendor;destsuffix=git/vendor/rpi" OPENSYNC_VENDOR_URI += "file://updated_vendor_arch_to_support_bpi.patch;patchdir=../vendor/rpi" -DEPENDS_append = " rdk-logger" +DEPENDS:append = " rdk-logger" -do_compile_prepend_broadband(){ +do_compile:prepend_broadband(){ cd ${WORKDIR}/git/vendor/rpi/ rm -rf src cd - diff --git a/meta-rdk-mtk-bpir4/recipes-rdkb/sys_mon_tools/cpuprocanalyzer_git.bbappend b/meta-rdk-mtk-bpir4/recipes-rdkb/sys_mon_tools/cpuprocanalyzer_git.bbappend index 2f0e8aea..6e7f7187 100644 --- a/meta-rdk-mtk-bpir4/recipes-rdkb/sys_mon_tools/cpuprocanalyzer_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-rdkb/sys_mon_tools/cpuprocanalyzer_git.bbappend @@ -1,4 +1,4 @@ -EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', ' --enable-procanalyzer-broadband', '', d)}" +EXTRA_OECONF:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', ' --enable-procanalyzer-broadband', '', d)}" DEPENDS += "telemetry json-c" -CFLAGS_append = " -DPROCANALYZER_BROADBAND" +CFLAGS:append = " -DPROCANALYZER_BROADBAND" diff --git a/meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend index 31e3871b..d6066b28 100644 --- a/meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend @@ -1,11 +1,11 @@ -SRC_URI_append = " \ +SRC_URI:append = " \ ${CMF_GITHUB_ROOT}/bananapi-sysint.git;;branch=${CMF_GIT_DEVELOP_BRANCH};protocol=${CMF_GIT_PROTOCOL};destsuffix=git/devicebpi;name=sysintdevicebpi \ " SRCREV_sysintdevicebpi = "${AUTOREV}" SRCREV_FORMAT = "sysintgeneric_sysintdevicebpi" -do_install_append () { +do_install:append () { #Webpa ServerURL echo "SERVERURL=https://webpa.rdkcentral.com:8080" >> ${D}${sysconfdir}/device.properties echo "Box_Type=bpi" >> ${D}${sysconfdir}/device.properties diff --git a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend index d4745370..da975641 100644 --- a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend @@ -1 +1,2 @@ -EXTRA_OECONF_remove_kirkstone = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " +EXTRA_OECONF:remove_kirkstone = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " +EXTRA_OECONF:remove:scarthgap = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " diff --git a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend index 645e15a4..7a40b534 100644 --- a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend @@ -1,14 +1,14 @@ -LDFLAGS_append = " -Wl,--no-as-needed -lm -llog4c -lrdkloggers" +LDFLAGS:append = " -Wl,--no-as-needed -lm -llog4c -lrdkloggers" inherit systemd coverity -SRC_URI_append = " \ +SRC_URI:append = " \ ${CMF_GIT_ROOT}/rdk/devices/raspberrypi/webpa-client;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/devices;name=rdkbbpi \ " SRCREV_rdkbbpi = "${AUTOREV}" do_fetch[vardeps] += "SRCREV_rdkbbpi" SRCREV_FORMAT .= "_rdkbbpi" -do_install_append () { +do_install:append () { install -d ${D}${systemd_unitdir}/system install -d ${D}${base_libdir_native}/rdk install -m 0644 ${S}/devices/broadband/parodus/systemd/parodus.service ${D}${systemd_unitdir}/system @@ -16,9 +16,9 @@ do_install_append () { sed -i "s/eth0/lan0/g" ${D}${base_libdir_native}/rdk/parodus_start.sh } -SYSTEMD_SERVICE_${PN}_append = " parodus.service" +SYSTEMD_SERVICE_${PN}:append = " parodus.service" -FILES_${PN}_append = " \ +FILES_${PN}:append = " \ ${systemd_unitdir}/system/parodus.service \ ${base_libdir_native}/rdk/* \ " diff --git a/meta-rdk-mtk-bpir4/recipes-support/webcfg/webcfg_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-support/webcfg/webcfg_1.0.bbappend index f4b3c8ea..0e3b3afb 100644 --- a/meta-rdk-mtk-bpir4/recipes-support/webcfg/webcfg_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-support/webcfg/webcfg_1.0.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append += " ${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', 'file://webconfig_metadata.json', '', d)}" +SRC_URI:append += " ${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', 'file://webconfig_metadata.json', '', d)}" inherit breakpad-wrapper DEPENDS += "breakpad breakpad-wrapper" -BREAKPAD_BIN_append = " webconfig" +BREAKPAD_BIN:append = " webconfig" LDFLAGS += "-lbreakpadwrapper -lpthread -lstdc++" CFLAGS += "-DINCLUDE_BREAKPAD" # generating minidumps -PACKAGECONFIG_append = "breakpad" +PACKAGECONFIG:append = "breakpad" diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 3e3fdd62..9e370c8c 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -74,7 +74,7 @@ touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied fi if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied ]; then -sed -i 's/^SRC_URI +=/SRC_URI_append =/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +sed -i 's/^SRC_URI +=/SRC_URI:append =/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied fi From 9ee3d66ec2755912993b29c5fb1c5b928382d1f7 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 13 Aug 2025 19:47:07 +0000 Subject: [PATCH 02/43] RDKBACCL-966 : Changes for OSS consumption build --- conf/machine/bananapi4-rdk-broadband.conf | 14 +++++++++++--- .../trusted-firmware-a/bootloader_prebuild.bb | 2 +- .../rdk-wifi-libhostap.bbappend | 2 +- .../u-boot/u-boot-tools_2024.01.bbappend | 11 +++++++++++ .../busybox/busybox_1.36.1.bbappend | 4 ++++ .../recipes-core/dbus/dbus_%.bbappend | 2 ++ .../glib-2.0/glib-2.0_2.7%.bbappend | 6 ++++++ .../macaddress/bpi-macaddress.bb | 2 +- .../BPI-resolving-port-triggering-errors.patch | 18 ++++++++++-------- .../recipes-kernel/linux/files/netfilter.cfg | 3 +++ .../linux/files/rdkb_cfg/bridge_mode.cfg | 1 + .../linux/files/rdkb_cfg/iptables_nf.cfg | 17 +++++++++++++++++ .../linux/linux-mediatek_%.bbappend | 7 +++++++ .../recipes-rdkb/usp-pa/usp-pa.bbappend | 2 ++ .../nettle/nettle_3.9.1.bbappend | 1 + setup-environment-refboard-rdkb | 18 ------------------ 16 files changed, 78 insertions(+), 32 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-ccsp/u-boot/u-boot-tools_2024.01.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/glib-2.0/glib-2.0_2.7%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-support/nettle/nettle_3.9.1.bbappend diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 93259ad4..891adcf7 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -4,7 +4,8 @@ #@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" @@ -12,10 +13,17 @@ 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" +#KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb" +#UBOOT_MACHINE = "bananapi_m64_defconfig" +#UBOOT_MACHINE = "mt7988_bpir4_defconfig" + +# 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" diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index bd98fe71..81950784 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -17,7 +17,7 @@ do_configure[noexec] = "1" # since there is no 'main' package generated (empty) RDEPENDS_${PN}-dev = "" -SRC_URI:append += " file://bpi-r4_sdmmc_bl2.img \ +SRC_URI += " file://bpi-r4_sdmmc_bl2.img \ file://bpi-r4_sdmmc_fip.bin" do_deploy() { diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 581a789b..0ec9f23b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -10,7 +10,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/u-boot/u-boot-tools_2024.01.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/u-boot/u-boot-tools_2024.01.bbappend new file mode 100644 index 00000000..a65dc983 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/u-boot/u-boot-tools_2024.01.bbappend @@ -0,0 +1,11 @@ +SRC_URI:remove = "file://CVE-2024-57254.patch \ + file://CVE-2024-57255.patch \ + file://CVE-2024-57256.patch \ + file://CVE-2024-57257.patch \ + file://CVE-2024-57258-1.patch \ + file://CVE-2024-57258-2.patch \ + file://CVE-2024-57258-3.patch \ + file://CVE-2024-57259.patch \ + " + +DEPENDS:append = "gnutls" diff --git a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend new file mode 100644 index 00000000..b6109530 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend @@ -0,0 +1,4 @@ + +SRC_URI:remove = "file://0001-add-ENABLE_FEATURE_SYSTEMD-and-use-it-in-syslogd.patch \ + file://busybox-1.31-ping-mdev-support.patch \ + " diff --git a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend new file mode 100644 index 00000000..7efa389e --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend @@ -0,0 +1,2 @@ +SRC_URI:remove = "file://01-dbus-ccsp-apis-1.14.8.patch \ + " diff --git a/meta-rdk-mtk-bpir4/recipes-core/glib-2.0/glib-2.0_2.7%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/glib-2.0/glib-2.0_2.7%.bbappend new file mode 100644 index 00000000..85b8fd3f --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/glib-2.0/glib-2.0_2.7%.bbappend @@ -0,0 +1,6 @@ +SRC_URI:remove = "file://0001-glib-gmessages-UTC_glib2_72.patch \ + file://0001-Fix-passing-NULL-to-g_task_get_cancellable.patch \ + file://0001-RDKTV-35445-Fix-localhost-DNS-resolution.patch \ + " + + diff --git a/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb b/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb index 906a2150..81c977bc 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb +++ b/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb @@ -3,7 +3,7 @@ SUMMARY = "Update the MAC address" LICENSE="Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" -inherit autotools ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)} systemd +inherit autotools ${@bb.utils.contains_any("DISTRO_FEATURES", "kirkstone scarthgap", "python3native", "pythonnative", d)} systemd SRC_URI = "git://github.com/rdkcentral/broadband-utils.git;branch=main;protocol=https;" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors.patch index 4be1137f..c696c511 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors.patch +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors.patch @@ -3,14 +3,16 @@ Index: kernel-source/include/linux/netfilter/x_tables.h =================================================================== --- kernel-source.orig/include/linux/netfilter/x_tables.h +++ kernel-source/include/linux/netfilter/x_tables.h -@@ -36,6 +36,7 @@ struct xt_action_param { - const void *matchinfo, *targinfo; - }; - const struct nf_hook_state *state; -+ unsigned int hooknum; - int fragoff; - unsigned int thoff; - bool hotdrop; ++@@ -36,6 +36,7 @@ + const void *matchinfo, *targinfo; + }; + const struct nf_hook_state *state; +-+ unsigned int hooknum; +- int fragoff; +++ unsigned int hooknum; + unsigned int thoff; ++ u16 fragoff; + bool hotdrop; Index: kernel-source/include/linux/timer.h =================================================================== --- kernel-source.orig/include/linux/timer.h diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index c4dddabe..9b0f89d3 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -60,3 +60,6 @@ CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m +CONFIG_IP_NF_TARGET_TRIGGER=n diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/bridge_mode.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/bridge_mode.cfg index cfd2ec1f..43b86be2 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/bridge_mode.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/bridge_mode.cfg @@ -20,3 +20,4 @@ CONFIG_BRIDGE_EBT_SNAT=y CONFIG_BRIDGE_EBT_LOG=y CONFIG_BRIDGE_EBT_ULOG=y CONFIG_BRIDGE_EBT_NFLOG=y +CONFIG_BRIDGE=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/iptables_nf.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/iptables_nf.cfg index 023f7003..c2ca2d76 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/iptables_nf.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/iptables_nf.cfg @@ -1,3 +1,20 @@ CONFIG_NF_CONNTRACK_TFTP=y CONFIG_NETFILTER_XT_TARGET_CT=y +CONFIG_USB=y +CONFIG_USB_NET_DRIVERS=y CONFIG_USB_NET_QMI_WWAN=y +CONFIG_USB_USBNET=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_MTK=y +CONFIG_BT=y +CONFIG_USB_NET_AX88179_178A=y +CONFIG_USB_RTL8152=y +CONFIG_BT_HCIBTUSB=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_INTEL=y +CONFIG_USB_ACM=y +CONFIG_TUN=y +CONFIG_IEEE802154=y +CONFIG_MAC802154=y +CONFIG_IPV6=m +CONFIG_NETFILTER_XT_FLOWOFFLOAD=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index a9338fec..b249a96c 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -13,4 +13,11 @@ SRC_URI += " \ file://rdkb_cfg/wps_key.cfg \ " +# Ensure DTBs are built even if we're using fitImage +do_compile:append() { + if [ -n "${KERNEL_DEVICETREE}" ]; then + oe_runmake ${KERNEL_DEVICETREE} + fi +} + CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" diff --git a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend index da975641..5a127f3e 100644 --- a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend @@ -1,2 +1,4 @@ EXTRA_OECONF:remove_kirkstone = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " EXTRA_OECONF:remove:scarthgap = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " + +SRCREV_FORMAT = "obuspa_usppa" diff --git a/meta-rdk-mtk-bpir4/recipes-support/nettle/nettle_3.9.1.bbappend b/meta-rdk-mtk-bpir4/recipes-support/nettle/nettle_3.9.1.bbappend new file mode 100644 index 00000000..0b453671 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/nettle/nettle_3.9.1.bbappend @@ -0,0 +1 @@ +EXTRA_OECONF:append = " --enable-shared --disable-static" diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 9e370c8c..884a3c54 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -60,24 +60,6 @@ sed -i '203 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia.bbappen touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia_changes_applied fi -if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied ]; then -sed -i '9 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '10 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '11 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '12 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '13 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '14 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '15 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '16 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '17 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied -fi - -if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied ]; then -sed -i 's/^SRC_URI +=/SRC_URI:append =/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend -touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied -fi - # commenting removing dbus.service from meta-cmf-filogic if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change ]; then sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_%.bbappend From 1629d2ea1cc59de6b35629ec3ac8787225c94de0 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 8 Oct 2025 18:01:50 +0000 Subject: [PATCH 03/43] RDKBACCL-1156: Build RDKB generic image --- conf/distro/include/rdk-bpi.inc | 1 + conf/machine/bananapi4-rdk-broadband.conf | 6 ++-- .../trusted-firmware-a/bootloader_prebuild.bb | 14 +++++++-- .../u-boot/u-boot_2024.01.bbappend | 2 ++ .../ccsp/ccsp-common-library.bbappend | 31 +++++++++++-------- .../recipes-ccsp/ccsp/ccsp-gwprovapp.bbappend | 2 +- .../recipes-ccsp/ccsp/ccsp-lm-lite.bbappend | 5 +++ .../recipes-ccsp/ccsp/ccsp-misc.bbappend | 2 ++ .../ccsp/ccsp-one-wifi-libwebconfig.bbappend | 7 +++-- .../recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 11 ++++++- .../recipes-ccsp/ccsp/ccsp-p-and-m.bbappend | 2 ++ .../recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend | 5 +-- .../recipes-ccsp/ccsp/ccsp-xdns.bbappend | 3 ++ .../recipes-ccsp/ccsp/parodus2ccsp.bbappend | 18 ++++++++--- .../ccsp/rdk-fwupgrade-manager.bbappend | 2 ++ .../ccsp/rdk-vlanmanager.bbappend | 1 + .../recipes-ccsp/ccsp/start-parodus.bbappend | 1 + .../hal/hal-wifi-generic_git.bbappend | 2 +- .../recipes-ccsp/hal/rdk-wifi-hal.bbappend | 2 +- .../unified-wifi-mesh-header.bb | 2 +- .../recipes-ccsp/util/utopia.bbappend | 7 +++-- .../breakpad-wrapper.bbappend | 7 +++++ .../lighttpd/lighttpd_1.4.53.bbappend | 4 +-- .../recipes-common/rbus/rbus.bbappend | 25 +++++++++++++++ .../rdk-logger/rdk-logger_git.bbappend | 1 + .../wpa-supplicant/wpa-supplicant_%.bbappend | 12 +++---- .../recipes-containers/crun/crun_%.bbappend | 2 ++ .../recipes-core/dbus/dbus_%.bbappend | 2 -- .../rdk-generic-broadband-image.bbappend | 2 +- .../packagegroup-filogic-mt76.bbappend | 2 +- .../packagegroup-rdk-ccsp-broadband.bbappend | 6 ++-- .../packagegroup-rdk-oss-broadband.bbappend | 2 +- .../recipes-core/systemd/systemd_%.bbappend | 29 +++++++++++++++++ .../init-filogic/init-filogic.bbappend | 9 +++--- .../jquery/jquery_3.7.1.bbappend | 1 + .../serialnumber/bpi-serialnumber.bb | 2 +- .../recipes-kernel/linux/files/netfilter.cfg | 2 ++ .../linux/linux-mediatek_%.bbappend | 21 +++++++++++++ .../opensync/opensync_%.bbappend | 2 +- .../dnsmasq/dnsmasq_2.90.bbappend | 13 ++++++++ .../parodus/parodus_1.0.bbappend | 13 ++++---- 41 files changed, 219 insertions(+), 64 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-bsp/u-boot/u-boot_2024.01.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-common/breakpad-wrapper/breakpad-wrapper.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-common/rbus/rbus.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-common/rdk-logger/rdk-logger_git.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-containers/crun/crun_%.bbappend delete mode 100644 meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/systemd/systemd_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-devtools/jquery/jquery_3.7.1.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-support/dnsmasq/dnsmasq_2.90.bbappend diff --git a/conf/distro/include/rdk-bpi.inc b/conf/distro/include/rdk-bpi.inc index f91c66c7..0a2100cc 100644 --- a/conf/distro/include/rdk-bpi.inc +++ b/conf/distro/include/rdk-bpi.inc @@ -48,3 +48,4 @@ DISTRO_FEATURES:remove = " lan0_as_wan" #DISTRO_FEATURES:append = " EasyMesh" #DISTRO_FEATURES:append = " sta_manager" PREFERRED_VERSION_go = "1.19.%" +PREFERRED_VERSION_wpa-supplicant = "2.11" diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 891adcf7..4cebb5b8 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -14,8 +14,6 @@ PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic" 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" -#UBOOT_MACHINE = "bananapi_m64_defconfig" -#UBOOT_MACHINE = "mt7988_bpir4_defconfig" # Ensure DTBs are built and packaged KERNEL_DEVICETREE = "mediatek/mt7988a-bananapi-bpi-r4.dtb" @@ -26,4 +24,6 @@ do_image_wic[recrdeps] = "do_build" #SDCARD supported Pre build bootloader do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy" -DISTRO_FEATURES:append = " rdkoss" +DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable" + +MACHINEOVERRIDES .= ":brodband" diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index 81950784..a405ddd8 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -15,10 +15,18 @@ 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 += " 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.img') + dst_bl2 = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_bl2.img') + shutil.copyfile(src_bl2, dst_bl2) + + src_fip = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_fip.bin') + dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip.bin') + shutil.copyfile(src_fip, dst_fip) +} do_deploy() { mkdir -p ${DEPLOYDIR}/atf/ diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/u-boot/u-boot_2024.01.bbappend b/meta-rdk-mtk-bpir4/recipes-bsp/u-boot/u-boot_2024.01.bbappend new file mode 100644 index 00000000..0ed75f24 --- /dev/null +++ b/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" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index 2e64134a..e42c3e9f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -56,21 +56,26 @@ do_install:append_class-target() { fi } +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 \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-gwprovapp.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-gwprovapp.bbappend index 22142fff..30fefeee 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-gwprovapp.bbappend +++ b/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 \ " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend index 6cf6d441..981d92d7 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend @@ -1 +1,6 @@ include ccsp_common_bananapi.inc + +EXTRA_OEMAKE += "LIBS='-lrbus'" + +FILES:${PN}-dev += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend index 40967269..11e986b1 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend @@ -3,3 +3,5 @@ include ccsp_common_bananapi.inc CFLAGS_aarch64:append = "-Werror=format-truncation=1" CFLAGS += " -DDHCPV4_CLIENT_UDHCPC -DDHCPV6_CLIENT_DIBBLER -DUDHCPC_RUN_IN_BACKGROUND" + +FILES:${PN}-dev += "${libdir}/*.so" 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 index c02c2383..f51e82fe 100644 --- 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 @@ -20,7 +20,8 @@ do_install:append() { 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_SOLIBSDEV = "" +INSANE_SKIP_${PN} += "dev-so" 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 index d5219c13..a83e8030 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -31,9 +31,18 @@ do_install:append(){ 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 \ " + diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend index 6cf6d441..92d70873 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend @@ -1 +1,3 @@ include ccsp_common_bananapi.inc + +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend index 67facc23..b436daa9 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-tr069-pa.bbappend @@ -1,6 +1,7 @@ include ccsp_common_bananapi.inc LDFLAGS += "-Wl,--no-as-needed -lulog" +TARGET_CFLAGS += "-Wno-error=address" do_install:append () { # Config files and scripts @@ -21,12 +22,12 @@ do_install:append () { echo "5555" > ${D}/usr/ccsp/tr069pa/sharedkey } -FILES_${PN}-ccsp += " \ +FILES:${PN}-ccsp += " \ ${prefix}/ccsp/tr069pa/CcspTr069PaSsp \ ${prefix}/ccsp/tr069pa/url \ " -FILES_${PN} += " \ +FILES:${PN} += " \ /fss/gw/usr/ccsp/ \ /fss/gw/version.txt \ /etc/url \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend index 6cf6d441..de9015fc 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend @@ -1 +1,4 @@ include ccsp_common_bananapi.inc + +TARGET_CFLAGS += "-Wno-error=address" +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend index 1968a07a..9b5f50c0 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend @@ -17,19 +17,27 @@ EXTRA_OECMAKE += "-DBUILD_BANANAPI_R4=ON " do_install:append () { install -d ${D}${systemd_unitdir}/system - install -d ${D}${base_libdir_native}/rdk + install -d ${D}${base_libdir}/rdk install -m 0644 ${S}/devices/broadband/parodus2ccsp/systemd/webpabroadband.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/devices/broadband/parodus2ccsp/scripts/webpa_pre_setup.sh ${D}${base_libdir_native}/rdk + install -m 0755 ${S}/devices/broadband/parodus2ccsp/scripts/webpa_pre_setup.sh ${D}${base_libdir}/rdk install -d ${D}/etc/parodus install -m 777 ${WORKDIR}/parodus_read_file.sh ${D}/etc/parodus/ install -m 777 ${WORKDIR}/parodus_create_file.sh ${D}/etc/parodus/ } -SYSTEMD_SERVICE_${PN}:append = " webpabroadband.service" +SYSTEMD_SERVICE:${PN}:append = " webpabroadband.service" -FILES_${PN}:append = " \ +FILES:${PN} += "${libdir}/libprivilege.so.*" +FILES:${PN}-dev += " \ + ${libdir}/libprivilege.so \ + ${libdir}/libprivilege.a \ +" + +FILES:${PN}:append = " \ ${systemd_unitdir}/system/webpabroadband.service \ - ${base_libdir_native}/rdk/* \ + ${base_libdir}/rdk/* \ /etc/parodus/* \ + ${bindir}/webpa \ + ${exec_prefix}/ccsp \ " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-fwupgrade-manager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-fwupgrade-manager.bbappend index 6cf6d441..faf12330 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-fwupgrade-manager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-fwupgrade-manager.bbappend @@ -1 +1,3 @@ include ccsp_common_bananapi.inc + +EXTRA_OEMAKE += "CFLAGS+='-I${STAGING_INCDIR}/safeclib'" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-vlanmanager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-vlanmanager.bbappend index 6cf6d441..c05f9739 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-vlanmanager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-vlanmanager.bbappend @@ -1 +1,2 @@ include ccsp_common_bananapi.inc +TARGET_CFLAGS += "-Wno-error=address" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/start-parodus.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/start-parodus.bbappend index 6cf6d441..c05f9739 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/start-parodus.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/start-parodus.bbappend @@ -1 +1,2 @@ include ccsp_common_bananapi.inc +TARGET_CFLAGS += "-Wno-error=address" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend index f95e026b..57b4f9fd 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend @@ -34,5 +34,5 @@ do_install:append(){ CFLAGS:append = " -DWIFI_HAL_VERSION_3 " CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' -D_ONE_WIFI_ ', '', d)}" -RDEPENDS_${PN} += "wpa-supplicant" +RDEPENDS:${PN} += "wpa-supplicant" 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 index 9ab491e4..4ff7df98 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend @@ -23,6 +23,6 @@ do_install:append() { install -m 0644 ${WORKDIR}/EasymeshCfg.json ${D}/nvram } -FILES_${PN} += " \ +FILES:${PN} += " \   /nvram/* \ " 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 index 8dd92e3b..88f9313d 100644 --- 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 @@ -14,4 +14,4 @@ do_install() { install -m 644 ${S}/inc/* ${D}/usr/include/ccsp } -FILES_${PN} += "/usr/include/ccsp/* " +FILES:${PN} += "/usr/include/ccsp/* " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index 8b9514b4..ad0ad2c1 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -8,7 +8,9 @@ do_install:append() { install -d ${D}${sysconfdir}/ install -d ${D}${sysconfdir}/utopia/ +install -d ${D}${sysconfdir}/utopia/service.d install -d -m 0777 ${D}/minidumps +install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}" if [ $DISTRO_WAN_ENABLED = 'true' ]; then @@ -84,6 +86,7 @@ $custom_data_model_enabled=0 $custom_data_model_file_name=/usr/ccsp/tr069pa/custom_mapper.xml" >> ${D}${sysconfdir}/utopia/system_defaults } -FILES_${PN} += " \ - /minidumps/ \ +FILES:${PN} += " \ + /minidumps/ \ " +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-common/breakpad-wrapper/breakpad-wrapper.bbappend b/meta-rdk-mtk-bpir4/recipes-common/breakpad-wrapper/breakpad-wrapper.bbappend new file mode 100644 index 00000000..cf9c8d3b --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/breakpad-wrapper/breakpad-wrapper.bbappend @@ -0,0 +1,7 @@ + +do_prepare_recipe_sysroot[depends] += "breakpad-native:do_populate_sysroot" + +CXXFLAGS += "-I${WORKDIR}/recipe-sysroot-native/usr/include/breakpad" + +LDFLAGS:append = "-lbreakpad_client" +BBCLASSEXTEND = "native" diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend index 149c111e..a89ee3e6 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend @@ -1,3 +1,3 @@ -SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " -SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " +#SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " +#SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " diff --git a/meta-rdk-mtk-bpir4/recipes-common/rbus/rbus.bbappend b/meta-rdk-mtk-bpir4/recipes-common/rbus/rbus.bbappend new file mode 100644 index 00000000..e47299ed --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/rbus/rbus.bbappend @@ -0,0 +1,25 @@ +BBCLASSEXTEND += "native" + +CFLAGS += "-Wno-error=use-after-free" +#TARGET_CFLAGS:append = "-Wno-format-security -Wno-stringop-truncation -Wno-stringop-overflow" +CFLAGS:append = "-Wno-format-security -Wno-stringop-truncation -Wno-stringop-overflow" + +DEPENDS:append:class-native = " msgpack-c-native linenoise-native" + +EXTRA_OECMAKE += "\ + -DCMAKE_SYSROOT=${STAGING_DIR_TARGET} \ + -DMSGPACK_LIBRARIES=${STAGING_DIR_TARGET}/usr/lib/libmsgpack-c.so \ + -DMSGPACK_INCLUDE_DIRS=${STAGING_DIR_TARGET}/usr/include \ + -DLINENOISE_LIBRARIES=${STAGING_DIR_TARGET}/usr/lib/liblinenoise.so \ + -DLINENOISE_INCLUDE_DIRS=${STAGING_DIR_TARGET}/usr/include \ +" + +EXTRA_OECMAKE:append:class-native = "\ + -DMSGPACK_INCLUDE_DIRS=${STAGING_DIR_NATIVE}/usr/include \ + -DMSGPACK_LIBRARIES=${STAGING_DIR_NATIVE}/usr/lib/libmsgpack-c.so \ + -DLINENOISE_INCLUDE_DIRS=${STAGING_DIR_NATIVE}/usr/include \ + -DLINENOISE_LIBRARIES=${STAGING_DIR_NATIVE}/usr/lib/liblinenoise.so \ +" + +FILES:${PN} += "${systemd_unitdir}/system/*" + diff --git a/meta-rdk-mtk-bpir4/recipes-common/rdk-logger/rdk-logger_git.bbappend b/meta-rdk-mtk-bpir4/recipes-common/rdk-logger/rdk-logger_git.bbappend new file mode 100644 index 00000000..d6f58699 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/rdk-logger/rdk-logger_git.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND += "native" 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 index 4b37c498..cff882ea 100644 --- 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,16 +1,16 @@ EXTRA_OEMAKE = "CONFIG_BUILD_WPA_CLIENT_SO=y" FILES_SOLIBSDEV = "" + +SRCREV = "${SRCREV_kernel6-6}" + 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" -FILES_${PN} += " /usr/local" +FILES:${PN} += "${includedir}/wpa_ctrl.h" +FILES:${PN} += "${libdir}/rdk" +FILES:${PN} += " /usr/local" FILES:${PN}-dbg += " /usr/local/" diff --git a/meta-rdk-mtk-bpir4/recipes-containers/crun/crun_%.bbappend b/meta-rdk-mtk-bpir4/recipes-containers/crun/crun_%.bbappend new file mode 100644 index 00000000..20242dae --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-containers/crun/crun_%.bbappend @@ -0,0 +1,2 @@ +# Remove seccomp from REQUIRED_DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES := "${@' '.join([f for f in d.getVar('REQUIRED_DISTRO_FEATURES').split() if f != 'seccomp'])}" diff --git a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend deleted file mode 100644 index 7efa389e..00000000 --- a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -SRC_URI:remove = "file://01-dbus-ccsp-apis-1.14.8.patch \ - " 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 index 7a044fe0..daa07d32 100644 --- 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 @@ -15,7 +15,7 @@ add_busybox_fixes() { if [ -d ${IMAGE_ROOTFS}/bin ]; then cd ${IMAGE_ROOTFS}/bin/ rm ps - rm ../usr/bin/awk + rm -f ../usr/bin/awk ln -sf /bin/busybox.nosuid ps ln -sf /bin/busybox.nosuid ${IMAGE_ROOTFS}/usr/bin/awk cd - 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 index ad78a1b9..fec234bf 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_packagegroup-filogic-mt76:remove_onewifi = " \ +RDEPENDS:packagegroup-filogic-mt76:remove:onewifi = " \ hostapd \ usteer \ wifi-test-tool \ diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend index 9a7c7ada..36b5ee46 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend @@ -1,9 +1,9 @@ -RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = " rdk-wifi-hal" +RDEPENDS:packagegroup-rdk-ccsp-broadband:remove = " rdk-wifi-hal" -RDEPENDS_packagegroup-rdk-ccsp-broadband:append = " \ +RDEPENDS:packagegroup-rdk-ccsp-broadband:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'rdk-wifi-hal', '' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', 'cpuprocanalyzer', ' ', d)} \ " GWPROVAPP = "${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','ccsp-gwprovapp', '' ,d)}" -RDEPENDS_packagegroup-rdk-ccsp-broadband:append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_cellular_manager_mm', ' rdk-cellularmanager-mm', ' ', d)}" +RDEPENDS:packagegroup-rdk-ccsp-broadband:append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_cellular_manager_mm', ' rdk-cellularmanager-mm', ' ', d)}" diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend index 2f3d754f..bc6562f4 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-oss-broadband.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_packagegroup-rdk-oss-broadband:append = " \ +RDEPENDS:packagegroup-rdk-oss-broadband:append = " \ evtest \ " diff --git a/meta-rdk-mtk-bpir4/recipes-core/systemd/systemd_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 00000000..a9ec755a --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,29 @@ +# Prevent systemd from forcing /etc/resolv.conf via update-alternatives +# and remove the resolv-conf.systemd symlink created during do_install. + +do_install:append() { + # Remove the resolv-conf.systemd symlink so update-alternatives won't try to + # convert /etc/resolv.conf into a link to it (which fails if resolv.conf is + # already a regular file provided by another package). + rm -f ${D}${sysconfdir}/resolv-conf.systemd || true + + # Remove any lines in the tmpfiles etc.conf that directly reference resolv.conf + # to avoid runtime tmpfiles rules pointing to a missing resolv-conf.systemd + if [ -f ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf ]; then + sed -i '/resolv.conf/d' ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf || true + fi +} + +python __anonymous() { + # Safely remove update-alternatives lines for resolv.conf from pkg postinst/prerm + postinst = d.getVar('pkg_postinst:systemd') or '' + if postinst: + postinst = postinst.replace('update-alternatives --install /etc/resolv.conf resolv-conf /etc/resolv-conf.systemd 50\\n', '') + postinst = postinst.replace('update-alternatives --remove resolv-conf /etc/resolv-conf.systemd\\n', '') + d.setVar('pkg_postinst:systemd', postinst) + + prerm = d.getVar('pkg_prerm:systemd') or '' + if prerm: + prerm = prerm.replace('update-alternatives --remove resolv-conf /etc/resolv-conf.systemd\\n', '') + d.setVar('pkg_prerm:systemd', prerm) +} diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index a4d2548f..f673f557 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -20,7 +20,8 @@ fi' ${D}${sbindir}/init-bridge.sh } #ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone -SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" -do_install:append_broadband () { - rm ${D}${systemd_unitdir}/system/usb-mount@.service -} +#SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" +#do_install:append_broadband () { +# rm ${D}${systemd_unitdir}/system/usb-mount@.service +#} + diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/jquery/jquery_3.7.1.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/jquery/jquery_3.7.1.bbappend new file mode 100644 index 00000000..4298072d --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-devtools/jquery/jquery_3.7.1.bbappend @@ -0,0 +1 @@ +PV = "3.7.1" diff --git a/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb b/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb index 66119ee3..e0814d02 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb +++ b/meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb @@ -22,7 +22,7 @@ do_install() { # install -D -m 0644 ${S}/rdkmmap/rdkmmap.service ${D}${systemd_unitdir}/system/rdkmmap.service } -#SYSTEMD_SERVICE_${PN} += " rdkmmap.service" +#SYSTEMD_SERVICE:${PN} += " rdkmmap.service" #FILES_${PN}:append = "${systemd_unitdir}/system/rdkmmap.service" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index 9b0f89d3..02535766 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -63,3 +63,5 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m CONFIG_IP_NF_TARGET_TRIGGER=n +CONFIG_NET_DSA=y +CONFIG_NET_DSA_AN8855=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index b249a96c..6abeff59 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -13,6 +13,12 @@ SRC_URI += " \ file://rdkb_cfg/wps_key.cfg \ " +# Tell kernel to actually apply them +KERNEL_CONFIG_FRAGMENTS += " \ + mediatek/filogic.cfg \ +" +#KERNEL_AUTO_APPEND_CONFIG = "1" + # Ensure DTBs are built even if we're using fitImage do_compile:append() { if [ -n "${KERNEL_DEVICETREE}" ]; then @@ -20,4 +26,19 @@ do_compile:append() { fi } +python __anonymous() { + # Use the correct package name; often the package is 'kernel-module-*' or 'kernel-6' + d.delVar("pkg_postinst:kernel-6") + # also target the generated package name if different; check build output and change above accordingly +} + +# Add on-target depmod instead +pkg_postinst_ontarget:kernel-6 () { + if [ -x /sbin/depmod ] || [ -x /usr/sbin/depmod ]; then + depmod -a || true + fi +} + CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" + +#IMAGE_INSTALL:append = " kernel-dev" diff --git a/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend b/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend index 5604d7ff..4c66c66f 100644 --- a/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-opensync/opensync/opensync_%.bbappend @@ -11,4 +11,4 @@ do_compile:prepend_broadband(){ rm -rf src cd - } -FILES_${PN} += "${includedir}/src" +FILES:${PN} += "${includedir}/src" diff --git a/meta-rdk-mtk-bpir4/recipes-support/dnsmasq/dnsmasq_2.90.bbappend b/meta-rdk-mtk-bpir4/recipes-support/dnsmasq/dnsmasq_2.90.bbappend new file mode 100644 index 00000000..e04b8329 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/dnsmasq/dnsmasq_2.90.bbappend @@ -0,0 +1,13 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-${PV}:" + +# Warning: RDK-B requires these changes to dnsmasq. If an RDK-B based build +# is using an alternative version of dnsmasq (a version to which these patches +# have not been ported) then expect runtime issues or missing functionality. + +do_install:append() { + sed -i -- 's/listen-address=127.0.0.1/#listen-address=127.0.0.1/g' ${D}${sysconfdir}/dnsmasq.conf + sed -i -- 's/bind/#Remove this statement/g' ${D}${sysconfdir}/dnsmasq.conf +} + +INSANE_SKIP:${PN} += "file-rdeps" + diff --git a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend index 7a40b534..52cac384 100644 --- a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend @@ -10,15 +10,16 @@ SRCREV_FORMAT .= "_rdkbbpi" do_install:append () { install -d ${D}${systemd_unitdir}/system - install -d ${D}${base_libdir_native}/rdk + install -d ${D}${base_libdir} + install -d ${D}${base_libdir}/rdk install -m 0644 ${S}/devices/broadband/parodus/systemd/parodus.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir_native}/rdk - sed -i "s/eth0/lan0/g" ${D}${base_libdir_native}/rdk/parodus_start.sh + install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir}/rdk + sed -i "s/eth0/lan0/g" ${D}${base_libdir}/rdk/parodus_start.sh } -SYSTEMD_SERVICE_${PN}:append = " parodus.service" +SYSTEMD_SERVICE:${PN}:append = " parodus.service" -FILES_${PN}:append = " \ +FILES:${PN}:append = " \ ${systemd_unitdir}/system/parodus.service \ - ${base_libdir_native}/rdk/* \ + ${base_libdir}/rdk/* \ " From c391c89a62278924760c0b76028021fe7b97e71e Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Tue, 14 Oct 2025 15:48:19 +0000 Subject: [PATCH 04/43] RDKBACCL-1156: Build RDKB generic image - Addressing Review comment --- conf/machine/bananapi4-rdk-broadband.conf | 2 +- .../recipes-devtools/init-filogic/init-filogic.bbappend | 7 ------- .../recipes-kernel/linux/files/netfilter.cfg | 2 -- .../recipes-kernel/linux/linux-mediatek_%.bbappend | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 4cebb5b8..903d4378 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -26,4 +26,4 @@ do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy" DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable" -MACHINEOVERRIDES .= ":brodband" +MACHINEOVERRIDES .= ":broadband" diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index f673f557..32d4a13f 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -18,10 +18,3 @@ if [ $? -eq 0 ];then \ done \ fi' ${D}${sbindir}/init-bridge.sh } - -#ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone -#SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" -#do_install:append_broadband () { -# rm ${D}${systemd_unitdir}/system/usb-mount@.service -#} - diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index 02535766..9b0f89d3 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -63,5 +63,3 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m CONFIG_IP_NF_TARGET_TRIGGER=n -CONFIG_NET_DSA=y -CONFIG_NET_DSA_AN8855=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 6abeff59..9af7400c 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -40,5 +40,3 @@ pkg_postinst_ontarget:kernel-6 () { } CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" - -#IMAGE_INSTALL:append = " kernel-dev" From e4ceb14741876e88b65412a6c35afe107e03ff3e Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Wed, 22 Oct 2025 16:45:03 +0530 Subject: [PATCH 05/43] RDKBACCL-1077 : Scarthgap - virtual/kernel build for kernel-6.6 filogic SDK Reason for change : Updated the changes of kernel-6.6 to scarthgap feature branch Test Procedure : None Risks: None Signed-off-by: ssiras826 --- conf/machine/bananapi4-rdk-broadband.conf | 2 +- .../ccsp/ccsp-common-library.bbappend | 3 +- .../rdk-wifi-libhostap.bbappend | 2 +- .../rdk-generic-broadband-image.bbappend | 35 +++++ .../files/cpu_procanalyzer_build_issues.patch | 25 +++ .../linux-libc-headers_%.bbappend | 4 + ...resolving-port-triggering-errors_6_6.patch | 146 ++++++++++++++++++ .../linux/files/enable_sdcard_6_6.patch | 82 ++++++++++ .../linux/files/rdkb_cfg/kernel_6_6.cfg | 19 +++ .../linux/linux-mediatek_%.bbappend | 11 +- setup-environment-refboard-rdkb | 2 +- 11 files changed, 326 insertions(+), 5 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/files/cpu_procanalyzer_build_issues.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors_6_6.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/kernel_6_6.cfg diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 903d4378..4eb10b26 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -13,7 +13,6 @@ 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" @@ -27,3 +26,4 @@ do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy" DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable" MACHINEOVERRIDES .= ":broadband" +KERNEL_CLASSES:remove = "itb-image" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index e42c3e9f..3c047900 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -53,7 +53,8 @@ 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 += " \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 0ec9f23b..83c31f2a 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -10,7 +10,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ 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 index daa07d32..6fe3951d 100644 --- 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 @@ -22,5 +22,40 @@ add_busybox_fixes() { fi } +do_filogic_gen_image(){ + if ${@bb.utils.contains('DISTRO_FEATURES','kernel_in_ubi','true','false',d)}; then + # create sysupgrade image align to openwrt + rm -rf ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} + rm -rf ${IMGDEPLOYDIR}/${PN}-${MACHINE}-sysupgrade.bin + + mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} + + cp ${DEPLOY_DIR_IMAGE}/fitImage ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel + cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then + fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + fi + cd ${IMGDEPLOYDIR} + tar cvf ${PN}-${MACHINE}-sysupgrade.bin sysupgrade-${PN}-${MACHINE} + mv ${PN}-${MACHINE}-sysupgrade.bin ${DEPLOY_DIR_IMAGE}/ + if ${@bb.utils.contains('DISTRO_FEATURES','secure_boot','true','false',d)}; then + + rm -rf ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb + rm -rf ${IMGDEPLOYDIR}/${PN}-${MACHINE}-sb-sysupgrade.bin + + mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb + + cp ${DEPLOY_DIR_IMAGE}/fitImage-sb ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel + cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then + fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + fi + + cd ${IMGDEPLOYDIR} + tar cvf ${PN}-${MACHINE}-sb-sysupgrade.bin sysupgrade-${PN}-${MACHINE}-sb + mv ${PN}-${MACHINE}-sb-sysupgrade.bin ${DEPLOY_DIR_IMAGE}/ + fi + fi +} 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)}" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/files/cpu_procanalyzer_build_issues.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/files/cpu_procanalyzer_build_issues.patch new file mode 100644 index 00000000..6cdf31fc --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/files/cpu_procanalyzer_build_issues.patch @@ -0,0 +1,25 @@ +diff -Naur linux-6.6-origin/include/uapi/linux/cn_proc.h linux-6.6/include/uapi/linux/cn_proc.h +--- linux-6.6-origin/include/uapi/linux/cn_proc.h 2025-06-25 08:58:10.740217229 +0100 ++++ linux-6.6/include/uapi/linux/cn_proc.h 2025-06-25 09:13:41.823330980 +0100 +@@ -69,8 +69,7 @@ + + static inline enum proc_cn_event valid_event(enum proc_cn_event ev_type) + { +- ev_type &= PROC_EVENT_ALL; +- return ev_type; ++ return (enum proc_cn_event)(ev_type & PROC_EVENT_ALL); + } + + /* +diff -Naur linux-6.6-origin/include/uapi/linux/connector.h linux-6.6/include/uapi/linux/connector.h +--- linux-6.6-origin/include/uapi/linux/connector.h 2025-06-25 08:58:10.744217260 +0100 ++++ linux-6.6/include/uapi/linux/connector.h 2025-06-25 09:07:39.468560364 +0100 +@@ -75,7 +75,7 @@ + + __u16 len; /* Length of the following data */ + __u16 flags; +- __u8 data[]; ++ __u8 data[0]; + }; + + #endif /* _UAPI__CONNECTOR_H */ diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend new file mode 100644 index 00000000..3408d5e1 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6', 'file://cpu_procanalyzer_build_issues.patch', '', d)} \ +" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors_6_6.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors_6_6.patch new file mode 100644 index 00000000..325605ec --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/BPI-resolving-port-triggering-errors_6_6.patch @@ -0,0 +1,146 @@ +Source: RDKM (aishwarya_natarajan2@comcast.com) +Index: kernel-source/include/linux/netfilter/x_tables.h +=================================================================== +--- kernel-source.orig/include/linux/netfilter/x_tables.h 2025-06-18 10:00:45.289656896 +0100 ++++ kernel-source/include/linux/netfilter/x_tables.h 2025-06-18 10:01:45.994210249 +0100 +@@ -36,6 +36,7 @@ + const void *matchinfo, *targinfo; + }; + const struct nf_hook_state *state; ++ unsigned int hooknum; + unsigned int thoff; + u16 fragoff; + bool hotdrop; +Index: kernel-source/include/linux/timer.h +=================================================================== +--- kernel-source.orig/include/linux/timer.h ++++ kernel-source/include/linux/timer.h +@@ -15,6 +15,7 @@ struct timer_list { + */ + struct hlist_node entry; + unsigned long expires; ++ unsigned long data; + void (*function)(struct timer_list *); + u32 flags; + +Index: kernel-source/include/net/netfilter/nf_conntrack.h +=================================================================== +--- kernel-source.orig/include/net/netfilter/nf_conntrack.h ++++ kernel-source/include/net/netfilter/nf_conntrack.h +@@ -24,6 +24,8 @@ + + #include + ++#define NF_CT_ASSERT(x) ++ + struct nf_ct_udp { + unsigned long stream_ts; + }; +Index: kernel-source/net/ipv4/netfilter/ipt_TRIGGER.c +=================================================================== +--- kernel-source.orig/net/ipv4/netfilter/ipt_TRIGGER.c ++++ kernel-source/net/ipv4/netfilter/ipt_TRIGGER.c +@@ -79,7 +79,7 @@ static void trigger_refresh(struct ipt_t + { + DEBUGP( KERN_LEVL "%s: \n", __FUNCTION__); + NF_CT_ASSERT(trig); +- spin_lock_bh(&nf_conntrack_lock); ++ spin_lock_bh(&nf_conntrack_expect_lock); + + /* Need del_timer for race avoidance (may already be dying). */ + if (del_timer(&trig->timeout)) { +@@ -87,7 +87,7 @@ static void trigger_refresh(struct ipt_t + add_timer(&trig->timeout); + } + +- spin_unlock_bh(&nf_conntrack_lock); ++ spin_unlock_bh(&nf_conntrack_expect_lock); + } + + static void __del_trigger(struct ipt_trigger *trig) +@@ -100,14 +100,14 @@ static void __del_trigger(struct ipt_tri + kfree(trig); + } + +-static void trigger_timeout(unsigned long ul_trig) ++static void trigger_timeout(struct timer_list *t) + { +- struct ipt_trigger *trig= (void *) ul_trig; ++ struct ipt_trigger *trig= from_timer(trig, t,timeout); + + DEBUGP( KERN_LEVL "trigger list %p timed out\n", trig); +- spin_lock_bh(&nf_conntrack_lock); ++ spin_lock_bh(&nf_conntrack_expect_lock); + __del_trigger(trig); +- spin_unlock_bh(&nf_conntrack_lock); ++ spin_unlock_bh(&nf_conntrack_expect_lock); + } + + static unsigned int +@@ -116,12 +116,12 @@ add_new_trigger(struct ipt_trigger *trig + struct ipt_trigger *new; + + DEBUGP( KERN_LEVL "!!!!!!!!!!!! %s !!!!!!!!!!!\n", __FUNCTION__); +- spin_lock_bh(&nf_conntrack_lock); ++ spin_lock_bh(&nf_conntrack_expect_lock); + new = (struct ipt_trigger *) + kmalloc(sizeof(struct ipt_trigger), GFP_ATOMIC); + + if (!new) { +- spin_unlock_bh(&nf_conntrack_lock); ++ spin_unlock_bh(&nf_conntrack_expect_lock); + DEBUGP( KERN_LEVL "%s: OOM allocating trigger list\n", __FUNCTION__); + return -ENOMEM; + } +@@ -133,13 +133,13 @@ add_new_trigger(struct ipt_trigger *trig + /* add to global table of trigger */ + list_add(&trigger_list, &new->list); + /* add and start timer if required */ +- init_timer(&new->timeout); ++ //init_timer(&new->timeout); + new->timeout.data = (unsigned long)new; + new->timeout.function = trigger_timeout; + new->timeout.expires = jiffies + (TRIGGER_TIMEOUT * HZ); +- add_timer(&new->timeout); ++ timer_setup(&new->timeout,trigger_timeout,0); + +- spin_unlock_bh(&nf_conntrack_lock); ++ spin_unlock_bh(&nf_conntrack_expect_lock); + + return 0; + } +@@ -304,7 +304,7 @@ trigger_in(struct sk_buff *skb) + return XT_CONTINUE; /* the match was done but no trigger exist */ + } + +-static void xt_nat_convert_range(struct nf_nat_range *dst, ++static void xt_nat_convert_range(struct nf_nat_range2 *dst, + const struct nf_nat_ipv4_range *src) + { + memset(&dst->min_addr, 0, sizeof(dst->min_addr)); +@@ -334,6 +334,7 @@ trigger_dnat(struct sk_buff *skb, int ho + enum ip_conntrack_info ctinfo; + struct nf_nat_ipv4_multi_range_compat newrange; + struct nf_nat_range range; ++ struct nf_nat_range2 range_info; + + DEBUGP( KERN_LEVL "####Starting %s ############\n", __FUNCTION__); + DEBUGP( KERN_LEVL "TRIGGER_DNAT: Protocol ->%s SRC_IP->%pI4" +@@ -368,7 +369,7 @@ trigger_dnat(struct sk_buff *skb, int ho + newrange.range[0].min.all = 0; + newrange.range[0].min.all = 0; + +- xt_nat_convert_range(&range, &newrange.range[0]); ++ xt_nat_convert_range(&range_info, &newrange.range[0]); + + /* + * We call here to create the nat processor that will replace packet source address +@@ -385,7 +386,7 @@ trigger_dnat(struct sk_buff *skb, int ho + */ + + /* Alter the destination of incoming packet. */ +- return nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST); ++ return nf_nat_setup_info(ct, &range_info, NF_NAT_MANIP_DST); + } + + diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch new file mode 100644 index 00000000..e6a85bb1 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch @@ -0,0 +1,82 @@ +diff --git a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +index c4455fbc..dd3bd8b1 100644 +--- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi ++++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +@@ -75,6 +75,15 @@ + default-state = "off"; + }; + }; ++ reg_3p3v: regulator-3p3v { ++ compatible = "regulator-fixed"; ++ regulator-name = "fixed-3.3V"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ + }; + + ð { +@@ -102,7 +111,7 @@ + }; + + &gsw_port0 { +- label = "wan"; ++ label = "lan0"; + }; + + &gsw_phy0_led0 { +@@ -304,6 +313,20 @@ + function = "pwm"; + }; + }; ++ mmc0_pins_default: mmc0-pins-default { ++ mux { ++ function = "flash"; ++ groups = "sdcard"; ++ }; ++ }; ++ ++ mmc0_pins_uhs: mmc0-pins-uhs { ++ mux { ++ function = "flash"; ++ groups = "sdcard"; ++ }; ++ }; ++ + }; + + &pwm { +@@ -402,3 +425,18 @@ + &xphy { + status = "okay"; + }; ++ ++&mmc0 { ++ pinctrl-names = "default", "state_uhs"; ++ pinctrl-0 = <&mmc0_pins_default>; ++ pinctrl-1 = <&mmc0_pins_uhs>; ++ bus-width = <4>; ++ max-frequency = <52000000>; ++ cap-sd-highspeed; ++ vmmc-supply = <®_3p3v>; ++ vqmmc-supply = <®_3p3v>; ++ no-mmc; ++ no-sdio; ++ status = "okay"; ++}; ++ +diff --git a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi +index 811b5f74..33f268ce 100644 +--- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi ++++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi +@@ -918,7 +918,7 @@ + "dma_ck"; + #address-cells = <2>; + #size-cells = <2>; +- status = "disabled"; ++ status = "okay"; + }; + + afe: audio-controller@11210000 { diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/kernel_6_6.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/kernel_6_6.cfg new file mode 100644 index 00000000..e956f3d1 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/kernel_6_6.cfg @@ -0,0 +1,19 @@ +CONFIG_USB=y +CONFIG_USB_NET_DRIVERS=y +CONFIG_USB_USBNET=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_MTK=y +CONFIG_BT=y +CONFIG_USB_NET_AX88179_178A=y +CONFIG_USB_RTL8152=y +CONFIG_BT_HCIBTUSB=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_INTEL=y +CONFIG_USB_ACM=y +CONFIG_TUN=y +CONFIG_IEEE802154=y +CONFIG_MAC802154=y +CONFIG_MTD_UBI=n +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_SFP=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 9af7400c..779af64b 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://0001-add-support-for-port-triggering.patch" -SRC_URI += "file://BPI-resolving-port-triggering-errors.patch" +SRC_URI += "file://BPI-resolving-port-triggering-errors_6_6.patch" SRC_URI += " \ file://rdkb_cfg/iptables_nf.cfg \ @@ -11,6 +11,8 @@ SRC_URI += " \ ${@bb.utils.contains('DISTRO_FEATURES','dac', 'file://rdkb_cfg/container.cfg', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','sdmmc','file://rdkb_cfg/sdmmc.cfg','',d)} \ file://rdkb_cfg/wps_key.cfg \ + file://rdkb_cfg/kernel_6_6.cfg \ + file://enable_sdcard_6_6.patch;apply=no \ " # Tell kernel to actually apply them @@ -19,6 +21,13 @@ KERNEL_CONFIG_FRAGMENTS += " \ " #KERNEL_AUTO_APPEND_CONFIG = "1" +do_filogic_patches:append() { + cd ${S} + if [ ! -e patch_applied_6_6 ]; then + patch -p1 < ${WORKDIR}/enable_sdcard_6_6.patch + touch patch_applied_6_6 + fi +} # Ensure DTBs are built even if we're using fitImage do_compile:append() { if [ -n "${KERNEL_DEVICETREE}" ]; then diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 884a3c54..e8fdd99c 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -80,7 +80,7 @@ else # SD card image is default else echo "**********************************************************************" echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES." - echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin" + echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_fip.bin" echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves." echo "> Place those binaries under ${_TOPDIR}/downloads/" echo "> EXITING NOW." From 34bf4cdeaa779f3c31653b1ec93b8f9146359d88 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 24 Oct 2025 15:40:18 +0530 Subject: [PATCH 06/43] RDKBACCL-1077 : Scarthgap - virtual/kernel build for kernel-6.6 filogic SDK Reason for change : Updated the changes of kernel-6.6 to scarthgap feature branch Test Procedure : None Risks: None Signed-off-by: ssiras826 --- conf/distro/include/rdk-bpi.inc | 2 ++ .../wpa-supplicant/wpa-supplicant_%.bbappend | 1 - .../wpa-supplicant/wpa-supplicant_2.11.bbappend | 1 + .../recipes-kernel/linux/linux-mediatek_%.bbappend | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bbappend diff --git a/conf/distro/include/rdk-bpi.inc b/conf/distro/include/rdk-bpi.inc index 0a2100cc..08229df8 100644 --- a/conf/distro/include/rdk-bpi.inc +++ b/conf/distro/include/rdk-bpi.inc @@ -49,3 +49,5 @@ DISTRO_FEATURES:remove = " lan0_as_wan" #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" 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 index cff882ea..0c281fe2 100644 --- 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,7 +1,6 @@ EXTRA_OEMAKE = "CONFIG_BUILD_WPA_CLIENT_SO=y" FILES_SOLIBSDEV = "" -SRCREV = "${SRCREV_kernel6-6}" do_install:append () { install -d ${D}${includedir} diff --git a/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bbappend b/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bbappend new file mode 100644 index 00000000..06814dab --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bbappend @@ -0,0 +1 @@ +SRCREV = "${SRCREV_kernel6-6}" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 779af64b..67c1ccf9 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -48,4 +48,9 @@ pkg_postinst_ontarget:kernel-6 () { fi } +do_install:append() { + # Remove any empty directories under /etc in ${D} + find ${D}${sysconfdir} -type d -empty -delete +} + CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" From 90ace57a355efb0127324f805795c4d37ed102b4 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 30 Oct 2025 06:34:04 +0000 Subject: [PATCH 07/43] RDKBACCL-1034 : Scarthgap - patch recreate for OSS build Reason for Change: Addressing FUZZ patch error for libubox Test Procedure: bitbake libubox Risks: Low Signed-off-by: ssiras826 --- ...braries-fix-libdir-scarthgap-updated.patch | 54 +++++++++++++++++++ .../libubox/libubox_git.bbappend | 6 +++ wic/sdimage-Bananapi.wks | 4 +- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-devtools/libubox/files/0001-version-libraries-fix-libdir-scarthgap-updated.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-devtools/libubox/libubox_git.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/libubox/files/0001-version-libraries-fix-libdir-scarthgap-updated.patch b/meta-rdk-mtk-bpir4/recipes-devtools/libubox/files/0001-version-libraries-fix-libdir-scarthgap-updated.patch new file mode 100644 index 00000000..7a6dcbfb --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-devtools/libubox/files/0001-version-libraries-fix-libdir-scarthgap-updated.patch @@ -0,0 +1,54 @@ +[PATCH] fix the CMAKE_INSTALL_LIBDIR + +Upstream-Status: Pending + +libdir maybe /usr/lib64 for 64bit machine + +Signed-off-by: Roy Li +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f40eaa6..783fa0a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS}) + SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c udebug.c udebug-remote.c) + + ADD_LIBRARY(ubox SHARED ${SOURCES}) ++SET_TARGET_PROPERTIES(ubox PROPERTIES VERSION 1.0.1 SOVERSION 1) + ADD_LIBRARY(ubox-static STATIC ${SOURCES}) + SET_TARGET_PROPERTIES(ubox-static PROPERTIES OUTPUT_NAME ubox) + +@@ -41,8 +42,8 @@ INSTALL(FILES ${headers} + DESTINATION include/libubox + ) + INSTALL(TARGETS ubox ubox-static +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + + ADD_SUBDIRECTORY(lua) +@@ -65,6 +66,7 @@ find_library(json NAMES json-c) + IF(EXISTS ${json}) + ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c) + TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json}) ++ SET_TARGET_PROPERTIES(blobmsg_json PROPERTIES VERSION 1.0.1 SOVERSION 1) + + ADD_LIBRARY(blobmsg_json-static STATIC blobmsg_json.c) + SET_TARGET_PROPERTIES(blobmsg_json-static +@@ -78,11 +80,12 @@ IF(EXISTS ${json}) + TARGET_LINK_LIBRARIES(jshn blobmsg_json ${json}) + + ADD_LIBRARY(json_script SHARED json_script.c) ++ SET_TARGET_PROPERTIES(json_script PROPERTIES VERSION 1.0.1 SOVERSION 1) + TARGET_LINK_LIBRARIES(json_script ubox) + + INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + ) + diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/libubox/libubox_git.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/libubox/libubox_git.bbappend new file mode 100644 index 00000000..7d6cea6b --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-devtools/libubox/libubox_git.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:remove:scarthgap = "\ + file://0001-version-libraries.patch \ + file://fix-libdir.patch \ +" +SRC_URI:append:scarthgap = "file://0001-version-libraries-fix-libdir-scarthgap-updated.patch" diff --git a/wic/sdimage-Bananapi.wks b/wic/sdimage-Bananapi.wks index 4e1cfb76..581ceceb 100644 --- a/wic/sdimage-Bananapi.wks +++ b/wic/sdimage-Bananapi.wks @@ -3,9 +3,9 @@ bootloader --ptable gpt --timeout=0 -part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2.img" --part-name bl2 --align 17 --fixed-size 4079K --active --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 +part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2_6-6.img" --part-name bl2 --align 17 --fixed-size 4079K --active --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 -part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip.bin" --part-name fip --align 6656 --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 +part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip_6-6.bin" --part-name fip --align 6656 --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 8704 --fixed-size 100M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 From fb7a979d482c41fdc62de6da263ac2b8654845f3 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 3 Nov 2025 06:05:36 +0000 Subject: [PATCH 08/43] RDKBACCL-1034 : Scarthgap - patch recreate for OSS build Reason for change : Addressing FUZZ patch error for ucode and compilation issues of dobby Test Procedure : bitbake dobby;bitbake ucode Risk : None Signed-off-by: ssiras826 --- .../trusted-firmware-a/bootloader_prebuild.bb | 12 +++++------ .../recipes-containers/dobby/dobby.bbappend | 2 ++ .../dobby/files/incomplete_type_error.patch | 19 ++++++++++++++++++ .../files/0001-change-cmakelist-updated.patch | 20 +++++++++++++++++++ .../recipes-wifi/ucode/ucode_git.bbappend | 6 ++++++ 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-containers/dobby/dobby.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-containers/dobby/files/incomplete_type_error.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-wifi/ucode/files/0001-change-cmakelist-updated.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-wifi/ucode/ucode_git.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index a405ddd8..27836f0a 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -19,18 +19,18 @@ RDEPENDS:${PN}-dev = "" python do_unpack:append() { import shutil, os - src_bl2 = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_bl2.img') - dst_bl2 = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_bl2.img') + 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.bin') - dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip.bin') + 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 diff --git a/meta-rdk-mtk-bpir4/recipes-containers/dobby/dobby.bbappend b/meta-rdk-mtk-bpir4/recipes-containers/dobby/dobby.bbappend new file mode 100644 index 00000000..0f8be009 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-containers/dobby/dobby.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append:scarthgap = "file://incomplete_type_error.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-containers/dobby/files/incomplete_type_error.patch b/meta-rdk-mtk-bpir4/recipes-containers/dobby/files/incomplete_type_error.patch new file mode 100644 index 00000000..52b900f7 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-containers/dobby/files/incomplete_type_error.patch @@ -0,0 +1,19 @@ +diff --git a/daemon/lib/source/DobbyRunC.cpp b/daemon/lib/source/DobbyRunC.cpp +index 26d8e761..bc8fe5bd 100644 +--- a/daemon/lib/source/DobbyRunC.cpp ++++ b/daemon/lib/source/DobbyRunC.cpp +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + + DobbyRunC::DobbyRunC(const std::shared_ptr& utils, +@@ -1311,4 +1312,4 @@ pid_t DobbyRunC::readPidFile(const std::string pidFilePath) const + } + + return containerPid; +-} +\ No newline at end of file ++} diff --git a/meta-rdk-mtk-bpir4/recipes-wifi/ucode/files/0001-change-cmakelist-updated.patch b/meta-rdk-mtk-bpir4/recipes-wifi/ucode/files/0001-change-cmakelist-updated.patch new file mode 100644 index 00000000..ce1a7411 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-wifi/ucode/files/0001-change-cmakelist-updated.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adf7dfb..5bed507 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,12 +41,10 @@ find_library(libblobmsg_json NAMES blobmsg_json) + find_package(ZLIB) + find_library(libmd NAMES libmd.a md) + +-if(LINUX) +- find_library(libnl_tiny NAMES nl-tiny) ++find_library(libnl_tiny NAMES nl-tiny) + +- if(libnl_tiny AND libubox) +- set(DEFAULT_NL_SUPPORT ON) +- endif() ++if(libnl_tiny AND libubox) ++ set(DEFAULT_NL_SUPPORT ON) + endif() + + if(libuci AND libubox) diff --git a/meta-rdk-mtk-bpir4/recipes-wifi/ucode/ucode_git.bbappend b/meta-rdk-mtk-bpir4/recipes-wifi/ucode/ucode_git.bbappend new file mode 100644 index 00000000..32b669fb --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-wifi/ucode/ucode_git.bbappend @@ -0,0 +1,6 @@ + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:remove:scarthgap = "\ + file://0001-change-cmakelist.patch \ +" +SRC_URI:append:scarthgap = " file://0001-change-cmakelist-updated.patch" From 6cb03f15ed6be2d19652e13c6d7b7583306c7c1a Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 4 Nov 2025 18:29:56 +0530 Subject: [PATCH 09/43] RDKBACCL-1210 : Addressing build issues in meta-cmf-bananapi layer Reason for change : addressing incomplete typedef for ecryptfs-utils Test Procedure : bitbake ecryptfs-utils should not throw incomplete typedef Risks: None Signed-off-by: ssiras826 --- .../ecryptfs-utils/ecryptfs-utils_%.bbappend | 2 + .../files/typedef_error_scarthgap.patch | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend new file mode 100644 index 00000000..83fc1eee --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append:scarthgap = " file://typedef_error_scarthgap.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch new file mode 100644 index 00000000..198dac30 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch @@ -0,0 +1,41 @@ +diff -Naur ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c +--- ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:43:26.832537641 +0000 ++++ ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:47:12.410605053 +0000 +@@ -145,6 +145,8 @@ + unsigned char *hash; + unsigned char *data = NULL; + int rc = 0; ++ const BIGNUM *n = NULL; ++ const BIGNUM *e = NULL; + + hash = malloc(SHA_DIGEST_LENGTH); + if (!hash) { +@@ -152,11 +154,12 @@ + rc = -ENOMEM; + goto out; + } +- nbits = BN_num_bits(key->n); ++ RSA_get0_key(key, &n, &e, NULL); ++ nbits = BN_num_bits(n); + nbytes = nbits / 8; + if (nbits % 8) + nbytes++; +- ebits = BN_num_bits(key->e); ++ ebits = BN_num_bits(e); + ebytes = ebits / 8; + if (ebits % 8) + ebytes++; +@@ -179,11 +182,11 @@ + data[i++] = '\02'; + data[i++] = (nbits >> 8); + data[i++] = nbits; +- BN_bn2bin(key->n, &(data[i])); ++ BN_bn2bin(n, &(data[i])); + i += nbytes; + data[i++] = (ebits >> 8); + data[i++] = ebits; +- BN_bn2bin(key->e, &(data[i])); ++ BN_bn2bin(e, &(data[i])); + i += ebytes; + SHA1(data, len + 3, hash); + to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); From eaad4e17b6b1dd8b57cce53ebf504a2775ef1c6a Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 6 Nov 2025 12:04:01 +0000 Subject: [PATCH 10/43] RDKBACCL-1034 : Scarthgap - patch recreate for OSS build Reason for Change: Addressing FUZZ patch error for mii-mgr and hunk error for dropbear , ecryptfs-utils patch is not requiref after incoparating the kirkstone patch to scarthgap as well Test Procedure: bitbake mii-mgr;bitbake dropbear Risks: Low Signed-off-by: ssiras826 --- .../recipes-core/dropbear/dropbear_%.bbappend | 5 +++ ...dropbear-extend-default-path-updated.patch | 12 ++++++ ...fix-rdkb-wan-get-status-fail-updated.patch | 11 +++++ .../mii-mgr/mii-mgr_%.bbappend | 5 +++ .../ecryptfs-utils/ecryptfs-utils_%.bbappend | 2 - .../files/typedef_error_scarthgap.patch | 41 ------------------- 6 files changed, 33 insertions(+), 43 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-core/dropbear/dropbear_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/dropbear/files/rdkb-dropbear-extend-default-path-updated.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/files/fix-rdkb-wan-get-status-fail-updated.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/mii-mgr_%.bbappend delete mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend delete mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch diff --git a/meta-rdk-mtk-bpir4/recipes-core/dropbear/dropbear_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/dropbear/dropbear_%.bbappend new file mode 100644 index 00000000..eaabe8fa --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/dropbear/dropbear_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:remove:scarthgap = "\ + file://rdkb-dropbear-extend-default-path.patch \ +" +SRC_URI:append:scarthgap = " file://rdkb-dropbear-extend-default-path-updated.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-core/dropbear/files/rdkb-dropbear-extend-default-path-updated.patch b/meta-rdk-mtk-bpir4/recipes-core/dropbear/files/rdkb-dropbear-extend-default-path-updated.patch new file mode 100644 index 00000000..21bc3a9f --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/dropbear/files/rdkb-dropbear-extend-default-path-updated.patch @@ -0,0 +1,12 @@ +Upstream-Status: Pending +--- dropbear-2022.83-origin/default_options.h 2025-11-05 06:55:14.092958375 +0000 ++++ dropbear-2022.83/default_options.h 2025-11-05 06:56:19.545554281 +0000 +@@ -351,7 +351,7 @@ + #define DEFAULT_IDLE_TIMEOUT 0 + + /* The default path. This will often get replaced by the shell */ +-#define DEFAULT_PATH "/usr/bin:/bin" ++#define DEFAULT_PATH "/usr/sbin:/usr/bin:/sbin:/bin" + #define DEFAULT_ROOT_PATH "/usr/sbin:/usr/bin:/sbin:/bin" + + #endif /* DROPBEAR_DEFAULT_OPTIONS_H_ */ diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/files/fix-rdkb-wan-get-status-fail-updated.patch b/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/files/fix-rdkb-wan-get-status-fail-updated.patch new file mode 100644 index 00000000..25157ea2 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/files/fix-rdkb-wan-get-status-fail-updated.patch @@ -0,0 +1,11 @@ +--- ../mii_mgr.c.bak 2025-11-05 06:30:21.007352264 +0000 ++++ ../mii_mgr.c 2025-11-05 06:29:02.738641737 +0000 +@@ -129,7 +129,7 @@ + is_priv = 0; + break; + case 'i': +- strncpy(ifname, optarg, 5); ++ strncpy(ifname, optarg, IFNAMSIZ); + ifname[IFNAMSIZ - 1] = '\0'; + break; + case 'p': diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/mii-mgr_%.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/mii-mgr_%.bbappend new file mode 100644 index 00000000..61a80559 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-devtools/mii-mgr/mii-mgr_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:remove:scarthgap = "\ + file://fix-rdkb-wan-get-status-fail.patch \ +" +SRC_URI:append:scarthgap = " file://fix-rdkb-wan-get-status-fail-updated.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend deleted file mode 100644 index 83fc1eee..00000000 --- a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append:scarthgap = " file://typedef_error_scarthgap.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch deleted file mode 100644 index 198dac30..00000000 --- a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c ---- ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:43:26.832537641 +0000 -+++ ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:47:12.410605053 +0000 -@@ -145,6 +145,8 @@ - unsigned char *hash; - unsigned char *data = NULL; - int rc = 0; -+ const BIGNUM *n = NULL; -+ const BIGNUM *e = NULL; - - hash = malloc(SHA_DIGEST_LENGTH); - if (!hash) { -@@ -152,11 +154,12 @@ - rc = -ENOMEM; - goto out; - } -- nbits = BN_num_bits(key->n); -+ RSA_get0_key(key, &n, &e, NULL); -+ nbits = BN_num_bits(n); - nbytes = nbits / 8; - if (nbits % 8) - nbytes++; -- ebits = BN_num_bits(key->e); -+ ebits = BN_num_bits(e); - ebytes = ebits / 8; - if (ebits % 8) - ebytes++; -@@ -179,11 +182,11 @@ - data[i++] = '\02'; - data[i++] = (nbits >> 8); - data[i++] = nbits; -- BN_bn2bin(key->n, &(data[i])); -+ BN_bn2bin(n, &(data[i])); - i += nbytes; - data[i++] = (ebits >> 8); - data[i++] = ebits; -- BN_bn2bin(key->e, &(data[i])); -+ BN_bn2bin(e, &(data[i])); - i += ebytes; - SHA1(data, len + 3, hash); - to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); From 741c1d3f16de0a59e0703877596242c318e02b34 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 6 Nov 2025 13:01:37 +0000 Subject: [PATCH 11/43] RDKBACCL-1210 : Addressing build issues in meta-cmf-bananapi layer Reason for change : Addressing build issues ccsp-onewifi, rdk-wanmanager,mt76-test,ipoe-health-check Test Procedure : bitbake ccsp-one-wifi Risk : None Signed-off-by: ssiras826 --- .../recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 4 ++- .../files/msgpack_redefined_compile.patch | 31 +++++++++++++++++++ .../recipes-ccsp/ccsp/rdk-wanmanager.bbappend | 1 + .../packagegroup-filogic-mt76.bbappend | 1 + .../ipoe-health-check.bbappend | 2 ++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/msgpack_redefined_compile.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-support/ipoe-health-check/ipoe-health-check.bbappend 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 index a83e8030..5dd14ed6 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -24,6 +24,8 @@ SRC_URI += " \ file://onewifi_pre_start.sh \ file://wifi_defaults.txt \ " +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/ @@ -45,4 +47,4 @@ FILES:${PN} += " \ /usr/bin/wifi_events_consumer \ /nvram/wifi_defaults.txt \ " - +INSANE_SKIP:${PN} += "file-rdeps" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/msgpack_redefined_compile.patch b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/msgpack_redefined_compile.patch new file mode 100644 index 00000000..b61df186 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/msgpack_redefined_compile.patch @@ -0,0 +1,31 @@ +diff --git a/source/dml/tr_181/ml/cosa_apis_util.c b/source/dml/tr_181/ml/cosa_apis_util.c +old mode 100755 +new mode 100644 +diff --git a/source/dml/tr_181/ml/cosa_wifi_dml.c b/source/dml/tr_181/ml/cosa_wifi_dml.c +old mode 100755 +new mode 100644 +diff --git a/source/dml/tr_181/ml/cosa_wifi_internal.c b/source/dml/tr_181/ml/cosa_wifi_internal.c +old mode 100755 +new mode 100644 +diff --git a/source/dml/tr_181/sbapi/cosa_wifi_apis.h b/source/dml/tr_181/sbapi/cosa_wifi_apis.h +old mode 100755 +new mode 100644 +diff --git a/source/utils/jsonconv.c b/source/utils/jsonconv.c +old mode 100755 +new mode 100644 +index b71ea162..4b243fa1 +--- a/source/utils/jsonconv.c ++++ b/source/utils/jsonconv.c +@@ -109,12 +109,6 @@ static char *format_string(const char *input) + return output; + } + +-int msgpack_pack_str_with_body(msgpack_packer* pk, const void* b, size_t l) +- { +- int ret = msgpack_pack_str(pk, l); +- if (ret != 0) { return ret; } +- return msgpack_pack_str_body(pk, b, l); +- } + + /* + * Pack cJSON object. diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend index 6cf6d441..8b4ad732 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend @@ -1 +1,2 @@ include ccsp_common_bananapi.inc +INSANE_SKIP:${PN} += "file-rdeps" 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 index fec234bf..ea50eb06 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend @@ -4,3 +4,4 @@ RDEPENDS:packagegroup-filogic-mt76:remove:onewifi = " \ wifi-test-tool \ vts \ " +RDEPENDS_packagegroup-filogic-mt76:remove:broadband = " mt76-test" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ipoe-health-check/ipoe-health-check.bbappend b/meta-rdk-mtk-bpir4/recipes-support/ipoe-health-check/ipoe-health-check.bbappend new file mode 100644 index 00000000..74459f11 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/ipoe-health-check/ipoe-health-check.bbappend @@ -0,0 +1,2 @@ +LDFLAGS = " -lmsgpackc" + From 27d466aca235343014992e594ccab5ccec121a27 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Tue, 11 Nov 2025 18:36:10 +0000 Subject: [PATCH 12/43] RDKBACCL-1034: Recreated busybox patch in OSS layer --- .../recipes-core/busybox/busybox_1.36.1.bbappend | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend deleted file mode 100644 index b6109530..00000000 --- a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ - -SRC_URI:remove = "file://0001-add-ENABLE_FEATURE_SYSTEMD-and-use-it-in-syslogd.patch \ - file://busybox-1.31-ping-mdev-support.patch \ - " From b93eb2b2c145cb52900c5bc1622f11ec12ebff79 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 12 Nov 2025 19:37:03 +0000 Subject: [PATCH 13/43] RDKBACCL-1034: Recreate lighttpd patch in OSS layer, remove not required patch --- .../recipes-common/lighttpd/lighttpd_1.4.53.bbappend | 3 --- .../recipes-common/lighttpd/lighttpd_1.4.74.bbappend | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend deleted file mode 100644 index a89ee3e6..00000000 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -#SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " -#SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " - diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend new file mode 100644 index 00000000..4eb9b729 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend @@ -0,0 +1 @@ +SRC_URI:remove:scarthgap += " file://0001-Force-UTC-for-lighttpd-log-messages.patch " From ae6ad23f7fba043bd21db813e550080cf29af66d Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 17 Nov 2025 07:15:19 +0000 Subject: [PATCH 14/43] RDKBACCL-1237 : do_rootfs issue is seen for rdk-generic-broadband-image Reason for change : observed do_hash_rootfs error for squashfs.xz Test Procedure : bitbake rdk-generic-broadband-image should not throw No such file or directory: for rdk-generic-broadband-image-bananapi4-rdk-broadband.squashfs-xz Risks: None Signed-off-by: ssiras826 --- .../rdk-generic-broadband-image.bbappend | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) 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 index 6fe3951d..fa63240c 100644 --- 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 @@ -21,17 +21,36 @@ add_busybox_fixes() { cd - fi } +python __anonymous () { + if "sd" in d.getVar('MACHINEOVERRIDES', True): + d.setVar('do_filogic_gen_image', 'do_filogic_gen_image_sdcard') +} -do_filogic_gen_image(){ +do_filogic_gen_image_sdcard(){ + SQUASHFS_FILE_PATH="${SQUASHFS_FILE_PATH}" # ensure exported + if [ -z "$SQUASHFS_FILE_PATH" ]; then + # fallback: check both possibilities + if [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" ]; then + SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" + elif [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" ]; then + SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" + else + echo "ERROR: no squashfs file found" + exit 1 + fi + fi if ${@bb.utils.contains('DISTRO_FEATURES','kernel_in_ubi','true','false',d)}; then # create sysupgrade image align to openwrt + # Use dynamically detected squashfs path + SQUASHFS_FILE="${IMGDEPLOYDIR}/$(basename ${SQUASHFS_FILE_PATH})" rm -rf ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} rm -rf ${IMGDEPLOYDIR}/${PN}-${MACHINE}-sysupgrade.bin mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} cp ${DEPLOY_DIR_IMAGE}/fitImage ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel - cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root fi @@ -46,7 +65,8 @@ do_filogic_gen_image(){ mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb cp ${DEPLOY_DIR_IMAGE}/fitImage-sb ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel - cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root fi @@ -57,5 +77,6 @@ do_filogic_gen_image(){ fi fi } + 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)}" From 0856b8583543d1380ae9a276bf44eeea352bedbc Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 17 Nov 2025 09:34:46 +0000 Subject: [PATCH 15/43] RDKBACCL-1259 : Address [file-rdeps] packages and compilation errors Reason for change : Addressed some of skipping file-rdeps with proper fix and compilation error with respect to onewifi and remving mt76-test Test Procedure : bitbake ccsp-one-wifi;bitbake rdk-wanmanager;bitbake rdk-wifi-libhostap ;bitbake atenl Risks: None Signed-off-by: ssiras826 --- .../recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 2 +- .../recipes-ccsp/ccsp/rdk-wanmanager.bbappend | 2 +- .../files/2.11/onewifi_undefine_global.patch | 13 +++++++++++++ .../rdk-wifi-libhostap.bbappend | 1 + .../rdk-generic-broadband-image.bbappend | 6 +----- .../packagegroup-filogic-mt76.bbappend | 2 +- .../recipes-wifi/aten/atenl.bbappend | 1 + setup-environment-refboard-rdkb | 18 ++++++++---------- 8 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/onewifi_undefine_global.patch create mode 100644 meta-rdk-mtk-bpir4/recipes-wifi/aten/atenl.bbappend 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 index 5dd14ed6..6da94bd0 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -47,4 +47,4 @@ FILES:${PN} += " \ /usr/bin/wifi_events_consumer \ /nvram/wifi_defaults.txt \ " -INSANE_SKIP:${PN} += "file-rdeps" +RDEPENDS:${PN} += "msgpack-c" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend index 8b4ad732..9b76e52f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend @@ -1,2 +1,2 @@ include ccsp_common_bananapi.inc -INSANE_SKIP:${PN} += "file-rdeps" +RDEPENDS:${PN} += " msgpack-c" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/onewifi_undefine_global.patch b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/onewifi_undefine_global.patch new file mode 100644 index 00000000..cbc69453 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/onewifi_undefine_global.patch @@ -0,0 +1,13 @@ +diff --git git/source/hostap-2.11/src/ap/hostapd.c git/source/hostap-2.11/src/ap/hostapd.c +index a05de030d..9ae1032c5 100644 +--- git/source/hostap-2.11/src/ap/hostapd.c ++++ git/source/hostap-2.11/src/ap/hostapd.c +@@ -73,7 +73,7 @@ static void hostapd_switch_color_timeout_handler(void *eloop_data, + void *user_ctx); + #endif /* CONFIG_IEEE80211AX */ + +- ++struct hapd_global global; + int hostapd_for_each_interface(struct hapd_interfaces *interfaces, + int (*cb)(struct hostapd_iface *iface, + void *ctx), void *ctx) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 83c31f2a..b21cc9ba 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -9,6 +9,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_10', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/Bpi_rdkwifilibhostap_2_11_changes.patch', 'file://2.10/Bpi_rdkwifilibhostap_2_10_changes.patch', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" +SRC_URI:append:scarthgap = " file://2.11/onewifi_undefine_global.patch" CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " 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 index fa63240c..f88d35cd 100644 --- 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 @@ -21,12 +21,8 @@ add_busybox_fixes() { cd - fi } -python __anonymous () { - if "sd" in d.getVar('MACHINEOVERRIDES', True): - d.setVar('do_filogic_gen_image', 'do_filogic_gen_image_sdcard') -} -do_filogic_gen_image_sdcard(){ +do_filogic_gen_image(){ SQUASHFS_FILE_PATH="${SQUASHFS_FILE_PATH}" # ensure exported if [ -z "$SQUASHFS_FILE_PATH" ]; then # fallback: check both possibilities 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 index ea50eb06..bdc331bf 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend @@ -4,4 +4,4 @@ RDEPENDS:packagegroup-filogic-mt76:remove:onewifi = " \ wifi-test-tool \ vts \ " -RDEPENDS_packagegroup-filogic-mt76:remove:broadband = " mt76-test" +RDEPENDS:packagegroup-filogic-mt76:remove:broadband = " mt76-test" diff --git a/meta-rdk-mtk-bpir4/recipes-wifi/aten/atenl.bbappend b/meta-rdk-mtk-bpir4/recipes-wifi/aten/atenl.bbappend new file mode 100644 index 00000000..6895c5e4 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-wifi/aten/atenl.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}:scarthgap += "file-rdeps" diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index e8fdd99c..507637ce 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -75,16 +75,14 @@ if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc else # SD card image is default mkdir -p ${_TOPDIR}/downloads - if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip.bin ]; then - echo "Both bl2 and fip binaries are present in local workspace." + if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_6-6.bin ]; then + echo "Both bl2 and fip binaries are present in local workspace for 6.6 kernel." else - echo "**********************************************************************" - echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES." - echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_fip.bin" - echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves." - echo "> Place those binaries under ${_TOPDIR}/downloads/" - echo "> EXITING NOW." - echo "**********************************************************************" - return 1 + echo "**********************************************************************" + echo "> Missing files are preventing the build from starting:" + echo "> The BL2 and FIP binaries for kernel-6.6 aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)" + echo "**********************************************************************" + return 1 + fi fi From e503f27d63570df608cce13c2e403406854f276f Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 06:14:14 +0000 Subject: [PATCH 16/43] RDKBACCL-1265 : erouter0 interface is not coming in scarthgap Reason for change : due to low priority of cmf-bananapi component recipe contents are override or not installed Test Procedure : Flash the scarthgap, check whether erouter0 is getting ip Risks: None Signed-off-by: ssiras826 --- conf/layer.conf | 1 + .../recipes-ccsp/ccsp/ccsp-common-library.bbappend | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 22406806..2aaf86f4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -16,3 +16,4 @@ require conf/include/rdk-bpi-bbmasks.inc require conf/distro/include/rdk-bpi.inc LAYERSERIES_COMPAT:cmf-bananapi = " kirkstone scarthgap" +BBFILE_PRIORITY_cmf-bananapi = "25" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index 3c047900..fa691dcc 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -6,7 +6,7 @@ SRC_URI:append = " \ " 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 @@ -63,7 +63,7 @@ TARGET_CFLAGS += " \ -Wno-error=format-truncation \ " -SYSTEMD_SERVICE:${PN}:remove_onewifi = " ccspwifiagent.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" @@ -73,7 +73,7 @@ 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: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} += "\ From 9de1d4d039a7d37e23d4580d554729d8d9948264 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 07:10:52 +0000 Subject: [PATCH 17/43] RDKBACCL-1273 : All ccsp logs are missed under rdklogs/logs folder Reason for change : In scarthgap builds,through this utopia.bbapend scripts installed newly losing the modified content Test Procedure : Flash the scarthgap, check /rdklogs/logs whether all log file are generated Risks: None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index ad0ad2c1..3862c325 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -6,11 +6,11 @@ SRC_URI += "file://service_bridge_bpi.sh" do_install:append() { -install -d ${D}${sysconfdir}/ -install -d ${D}${sysconfdir}/utopia/ -install -d ${D}${sysconfdir}/utopia/service.d +#install -d ${D}${sysconfdir}/ +#install -d ${D}${sysconfdir}/utopia/ +#install -d ${D}${sysconfdir}/utopia/service.d install -d -m 0777 ${D}/minidumps -install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ +#install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}" if [ $DISTRO_WAN_ENABLED = 'true' ]; then From 8aa17425defbdd809e022c85b2efab5168ca2147 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 07:26:42 +0000 Subject: [PATCH 18/43] RDKBACCL-1274 : Scarthgap image is not booting up Reason for change : in scarthgap image, kernel is trying to mount the rootfs to ubi Test Procedure : Flash the scarthgap in different boards Risks: None Signed-off-by: ssiras826 --- .../linux/files/enable_sdcard_6_6.patch | 29 ++++++++++++++++--- .../linux/linux-mediatek_%.bbappend | 6 ++-- setup-environment-refboard-rdkb | 5 ++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch index e6a85bb1..20159ae5 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch @@ -2,7 +2,17 @@ diff --git a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi b/arch/ar index c4455fbc..dd3bd8b1 100644 --- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi -@@ -75,6 +75,15 @@ +@@ -28,8 +28,7 @@ + + chosen { + stdout-path = &uart0; +- bootargs = "console=ttyS0,115200n1 loglevel=8 pci=pcie_bus_perf ubi.block=0,fit root=/dev/fit0 rootwait"; +- rootdisk-spim-nand = <&ubi_rootfs>; ++ bootargs = "earlycon console=ttyS0,115200 root=/dev/mmcblk0p4 rootfstype=ext4 rw rootwait debug=7"; + }; + + memory { +@@ -75,6 +74,15 @@ default-state = "off"; }; }; @@ -18,7 +28,7 @@ index c4455fbc..dd3bd8b1 100644 }; ð { -@@ -102,7 +111,7 @@ +@@ -102,7 +110,7 @@ }; &gsw_port0 { @@ -27,7 +37,7 @@ index c4455fbc..dd3bd8b1 100644 }; &gsw_phy0_led0 { -@@ -304,6 +313,20 @@ +@@ -304,6 +312,20 @@ function = "pwm"; }; }; @@ -48,7 +58,18 @@ index c4455fbc..dd3bd8b1 100644 }; &pwm { -@@ -402,3 +425,18 @@ +@@ -379,6 +401,10 @@ + }; + }; + ++&spi_nand { ++ status = "disabled"; ++}; ++ + &uart0 { + status = "okay"; + }; +@@ -402,3 +428,18 @@ &xphy { status = "okay"; }; diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 67c1ccf9..2b9cfc56 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -24,8 +24,10 @@ KERNEL_CONFIG_FRAGMENTS += " \ do_filogic_patches:append() { cd ${S} if [ ! -e patch_applied_6_6 ]; then - patch -p1 < ${WORKDIR}/enable_sdcard_6_6.patch - touch patch_applied_6_6 + if ${@bb.utils.contains('DISTRO_FEATURES', 'sdmmc', 'true', 'false', d)}; then + patch -p1 < ${WORKDIR}/enable_sdcard_6_6.patch + touch patch_applied_6_6 + fi fi } # Ensure DTBs are built even if we're using fitImage diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index e8fdd99c..c7e66df8 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -71,6 +71,11 @@ if [ "X$FEATURE_TYPE" == "XEasyMesh" ]; then sed -i '/sta_manager/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc fi +if [ ! -e ${_TOPDIR}/meta-filogic/recipes-kernel/linux/linux_changes_applied ]; then + sed -i -e '/WORKDIR}\/003-rdkb-refactor-bpi-r4-dts.patch/s/^/#/' ${_TOPDIR}/meta-filogic/recipes-kernel/linux/linux-mediatek_6.6.bb + touch ${_TOPDIR}/meta-filogic/recipes-kernel/linux/linux_changes_applied +fi + if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc else # SD card image is default From b0a8c9b0eee9e71800f793dbae3e558c64c958f5 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 4 Dec 2025 11:33:47 +0000 Subject: [PATCH 19/43] RDKBACCL-1316 : Addressing missing lib*.so files for scarthgap rootfs Reason for change : To bring missed lib*so by removing under {PN}-dev for rootfs Test Procedure : check whether rootfs have these respective files and wifi testing Risks: None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend | 2 +- .../recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend | 6 +++++- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 4 ++++ meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend | 6 +++++- meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend | 5 ++++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend index 981d92d7..8527f06e 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend @@ -2,5 +2,5 @@ include ccsp_common_bananapi.inc EXTRA_OEMAKE += "LIBS='-lrbus'" -FILES:${PN}-dev += "${libdir}/*.so" +#FILES:${PN}-dev += "${libdir}/*.so" INSANE_SKIP:${PN} += "dev-so" 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 index f51e82fe..ee343f78 100644 --- 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 @@ -23,5 +23,9 @@ do_install:append() { FILES:${PN} += " \ ${libdir}/libwifi_bus.so.* \ " +FILES:${PN} += " \ + ${libdir}/*so \ +" + FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" 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 index 6da94bd0..5e73026f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -48,3 +48,7 @@ FILES:${PN} += " \ /nvram/wifi_defaults.txt \ " RDEPENDS:${PN} += "msgpack-c" +FILES:${PN} += "${libdir}/*.so" +FILES:${PN}-dev:remove = "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" + diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend index 92d70873..2584220e 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend @@ -1,3 +1,7 @@ include ccsp_common_bananapi.inc -FILES:${PN}-dev += "${libdir}/*.so" +#FILES:${PN}-dev += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" + +SRC_URI:remove = "file://filogic-factoryReset.patch" + diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index 3862c325..18a0a680 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -89,4 +89,7 @@ $custom_data_model_file_name=/usr/ccsp/tr069pa/custom_mapper.xml" >> ${D}${sysc FILES:${PN} += " \ /minidumps/ \ " -FILES:${PN}-dev += "${libdir}/*.so" +#FILES:${PN}-dev += "${libdir}/*.so" +FILES:${PN} += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" + From a20f499bcb32d8b0908e689bfc7b9b1a18b8a669 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 9 Dec 2025 05:57:41 +0000 Subject: [PATCH 20/43] RDKBACCL-1288 : Ccspwebui service is in activating state Reason for change : added missed script file for lighttpd.conf for ports and assignment Test procedure : systemctl status CcspWebUI.service Risks: None Signed-off-by: ssiras826 --- .../recipes-common/lighttpd/lighttpd_1.4.74.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend index 4eb9b729..cf3f8923 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend @@ -1 +1,4 @@ SRC_URI:remove:scarthgap += " file://0001-Force-UTC-for-lighttpd-log-messages.patch " +do_install:append(){ +sed -i '$ a include_shell "sh /etc/webgui_config.sh"' ${D}${sysconfdir}/lighttpd.conf +} From d329fb1c2477dfa2a55b1efeea82d6d633920b86 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 9 Dec 2025 06:37:14 +0000 Subject: [PATCH 21/43] Revert "RDKBACCL-1288 : Ccspwebui service is in activating state" This reverts commit a20f499bcb32d8b0908e689bfc7b9b1a18b8a669. --- .../recipes-common/lighttpd/lighttpd_1.4.74.bbappend | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend index cf3f8923..4eb9b729 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend @@ -1,4 +1 @@ SRC_URI:remove:scarthgap += " file://0001-Force-UTC-for-lighttpd-log-messages.patch " -do_install:append(){ -sed -i '$ a include_shell "sh /etc/webgui_config.sh"' ${D}${sysconfdir}/lighttpd.conf -} From ec36ee48ce25433cb54ed5029b5dcef18b7b7890 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 9 Dec 2025 06:48:17 +0000 Subject: [PATCH 22/43] RDKBACCL-1288 : Ccspwebui service is in activating state Reason for change : added missed script file for lighttpd.conf for ports and assignment Test procedure : systemctl status CcspWebUI.service Risks: None Signed-off-by: ssiras826 --- .../recipes-common/lighttpd/lighttpd_1.4.74.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend index 4eb9b729..cf3f8923 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend @@ -1 +1,4 @@ SRC_URI:remove:scarthgap += " file://0001-Force-UTC-for-lighttpd-log-messages.patch " +do_install:append(){ +sed -i '$ a include_shell "sh /etc/webgui_config.sh"' ${D}${sysconfdir}/lighttpd.conf +} From bb31bb27d98ffdcad809288aa17b1fbb9b68f560 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 11 Dec 2025 12:39:57 +0000 Subject: [PATCH 23/43] RDKBACCL-1288 : Ccspwebui service is in activating state Reason for change : Addressed Connected Device not showing when it connected in Online. Remote management Not openning but 8080 8181 port. In wifi security was in empty blank for all 3 SSID Managed Device allowed/blocked pages casusing 500 Internal server Test procedure : Check webui functionalities Risks: None Signed-off-by: ssiras826 --- .../recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml | 2 ++ .../recipes-ccsp/ccsp/ccsp-webui-jst.bbappend | 6 ++++++ meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml index d149f15d..344fbe5d 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml @@ -1279,4 +1279,6 @@ 0 true + + 1 diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend index 5bda6917..8330575f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend @@ -11,4 +11,10 @@ do_install:append () { install -m 0755 ${S}/jst/actionHandler/ajaxSet_wizard_step2_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wizard_step2.jst install -m 0755 ${S}/jst/actionHandler/ajaxSet_wps_config_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wps_config.jst fi + sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g" ${D}/usr/www2/actionHandler/ajax_managed_devices.jst + sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g" ${D}/usr/www2/actionHandler/ajax_managed_services.jst + sed -i "s/count(\$IDs)-1/count(\$IDs)-2/g" ${D}/usr/www2/actionHandler/ajax_port_forwarding.jst + sed -i "/getInstanceIDs(\"Device.Hosts.Host.\")/a \$hostIDs=\$hostIDs[count(\$hostIDs)-2];" ${D}/usr/www2/managed_devices_add_computer_allowed.jst + sed -i "/getInstanceIDs(\"Device.Hosts.Host.\")/a \$hostIDs=\$hostIDs[count(\$hostIDs)-2];" ${D}/usr/www2/managed_devices_add_computer_blocked.jst + sed -i "s/\$clients_RSSI\[strtoupper(\$Host\[\$i.toString()\]\['PhysAddress'\])\]/\$Host\[\$i\]\['X_CISCO_COM_RSSI'\]/g" ${D}/usr/www2/connected_devices_computers.jst } diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index 18a0a680..c3684c43 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -48,6 +48,9 @@ sed -i 's/^$CosaNAT::port_trigger_enabled=1/$CosaNAT::port_trigger_enabled=0/' $ install -m 755 ${WORKDIR}/service_bridge_bpi.sh ${D}${sysconfdir}/utopia/service.d/ install -m 755 ${WORKDIR}/service_bridge_bpi.sh ${D}${sysconfdir}/utopia/service.d/service_bridge.sh + +sed -i '/^#TOT_MSG_MAX=\$/s/^#//' ${D}${sysconfdir}/utopia/utopia_init.sh + #Adding self heal defaults echo "#SelfHeal \$ConnTest_PingInterval=60 @@ -84,6 +87,12 @@ echo "#SelfHeal #Custom Data Model $custom_data_model_enabled=0 $custom_data_model_file_name=/usr/ccsp/tr069pa/custom_mapper.xml" >> ${D}${sysconfdir}/utopia/system_defaults + + #Remote management + sed -i 's/^\(\$mgmt_wan_httpsaccess=\)0/\11/' ${D}${sysconfdir}/utopia/system_defaults + sed -i 's/^\(\$mgmt_wan_httpaccess=\)1/\10/' ${D}${sysconfdir}/utopia/system_defaults + sed -i 's/^\(\$mgmt_wan_httpsport=\)443/\18181/' ${D}${sysconfdir}/utopia/system_defaults + sed -i '/mgmt_wan_httpaccess/i \$mgmt_wan_httpaccess_ert=1' ${D}${sysconfdir}/utopia/system_defaults } FILES:${PN} += " \ From 6d831d5fdd113cab3689fa578352a4ee24a03151 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 16 Dec 2025 12:59:58 +0000 Subject: [PATCH 24/43] RDKBACCL-1288 : Ccspwebui service is in activating state Reason for change : Addressed iptable rules issue so that parental control will work as excepted Test procedure : check the iptables rules Risks: None Signed-off-by: ssiras826 --- .../iptables/files/0001-add-port-triggering-support.patch | 1 + .../{iptables_1.8.7.bbappend => iptables_1.8.%.bbappend} | 3 +-- meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename meta-rdk-mtk-bpir4/recipes-extended/iptables/{iptables_1.8.7.bbappend => iptables_1.8.%.bbappend} (76%) diff --git a/meta-rdk-mtk-bpir4/recipes-extended/iptables/files/0001-add-port-triggering-support.patch b/meta-rdk-mtk-bpir4/recipes-extended/iptables/files/0001-add-port-triggering-support.patch index 3e27c8aa..89f2c11a 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/iptables/files/0001-add-port-triggering-support.patch +++ b/meta-rdk-mtk-bpir4/recipes-extended/iptables/files/0001-add-port-triggering-support.patch @@ -1,4 +1,5 @@ Source: Backport from http://asuswrt-merlin.ng/ +Upstream-Status: Pending Index: iptables-1.8.4/extensions/libipt_TRIGGER.c =================================================================== --- /dev/null diff --git a/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.%.bbappend similarity index 76% rename from meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend rename to meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.%.bbappend index 05ae856a..664edefc 100644 --- a/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.%.bbappend @@ -1,7 +1,6 @@ -RRECOMMENDS_${PN}:append += "kernel-module-xt-nat \ +RRECOMMENDS:${PN}:append = "kernel-module-xt-nat \ kernel-module-ipt-trigger" - FILESEXTRAPATHS:prepend:="${THISDIR}/files:" SRC_URI:append = "file://0001-add-port-triggering-support.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index 9b0f89d3..67f25742 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -22,6 +22,7 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XT_MATCH_STRING=y # # IP: Netfilter Configuration From a1d99840a1d36466b3f43a2b743319cac50f4b4b Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 16 Dec 2025 13:22:08 +0000 Subject: [PATCH 25/43] RDKBACCL-1348 : In scarthgap brlan0 is getting ip from bridge mode to router mode Reason for change: Bringing this fix into scarthgap branch Test procedure: Checked IP for brlan0 during switch back from bridgemode Risks: Low Signed-off-by: ssiras826 --- .../recipes-ccsp/util/utopia/service_bridge_bpi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia/service_bridge_bpi.sh b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia/service_bridge_bpi.sh index cacbd175..e870598b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia/service_bridge_bpi.sh +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia/service_bridge_bpi.sh @@ -440,6 +440,7 @@ virtual_interface() if [ "$LAN_IP" != "$dst_ip" ]; then ifconfig "$CMDIAG_IF" $dst_ip netmask "$LAN_NETMASK" up fi + sysevent set ipv4_4-status down else ifconfig "$CMDIAG_IF" down ifconfig l"$CMDIAG_IF" down From e4e2630509fae3d541741a5875a6da5d0d61395a Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 18 Dec 2025 17:28:51 +0530 Subject: [PATCH 26/43] RDKBACCL-1316 : Addressing missing lib*.so files for scarthgap rootfs Reason for change : To bring missed lib*so by removing under {PN}-dev for rootfs Test Procedure : check whether rootfs have these respective files and wifi testing Risks: None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend | 2 +- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend | 2 +- .../recipes-common/telemetry/telemetry_git.bbappend | 1 + .../recipes-support/json-hal/json-hal-lib.bbappend | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-common/telemetry/telemetry_git.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-support/json-hal/json-hal-lib.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend index 11e986b1..01f6cfc2 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend @@ -4,4 +4,4 @@ CFLAGS_aarch64:append = "-Werror=format-truncation=1" CFLAGS += " -DDHCPV4_CLIENT_UDHCPC -DDHCPV6_CLIENT_DIBBLER -DUDHCPC_RUN_IN_BACKGROUND" -FILES:${PN}-dev += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend index de9015fc..45d80cd5 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend @@ -1,4 +1,4 @@ include ccsp_common_bananapi.inc TARGET_CFLAGS += "-Wno-error=address" -FILES:${PN}-dev += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-rdk-mtk-bpir4/recipes-common/telemetry/telemetry_git.bbappend b/meta-rdk-mtk-bpir4/recipes-common/telemetry/telemetry_git.bbappend new file mode 100644 index 00000000..e7fa0c7e --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/telemetry/telemetry_git.bbappend @@ -0,0 +1 @@ +FILES:${PN}-dev:remove = "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-support/json-hal/json-hal-lib.bbappend b/meta-rdk-mtk-bpir4/recipes-support/json-hal/json-hal-lib.bbappend new file mode 100644 index 00000000..07f8cec5 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/json-hal/json-hal-lib.bbappend @@ -0,0 +1,4 @@ +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/* \ + ${bindir}/* " +INSANE_SKIP:${PN} += "dev-so" From 1a3516fa4eb60081a905a272736646cb10621b8c Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Thu, 31 Jul 2025 17:20:44 +0000 Subject: [PATCH 27/43] RDKBACCL-1002 : Set bitbake symbols, DISTRO, kernel_6.6 --- .../trusted-firmware-a/bootloader_prebuild.bb | 2 ++ .../ccsp/ccsp-common-library.bbappend | 28 +++++++++---------- .../recipes-ccsp/ccsp/parodus2ccsp.bbappend | 12 ++------ .../rdk-wifi-libhostap.bbappend | 3 +- .../lighttpd/lighttpd_1.4.53.bbappend | 3 ++ .../packagegroup-rdk-ccsp-broadband.bbappend | 2 +- .../init-filogic/init-filogic.bbappend | 6 ++++ .../iptables/iptables_1.8.7.bbappend | 7 +++++ .../parodus/parodus_1.0.bbappend | 19 ++++++------- setup-environment-refboard-rdkb | 18 ++++++++++++ 10 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index 27836f0a..e8c8a947 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -27,6 +27,8 @@ python do_unpack:append() { dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip_6-6.bin') shutil.copyfile(src_fip, dst_fip) } +SRC_URI:append += " file://bpi-r4_sdmmc_bl2.img \ + file://bpi-r4_sdmmc_fip.bin" do_deploy() { mkdir -p ${DEPLOYDIR}/atf/ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index fa691dcc..c8b90395 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -6,7 +6,7 @@ SRC_URI:append = " \ " 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 @@ -63,20 +63,20 @@ TARGET_CFLAGS += " \ -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} += "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" +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" -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} += "\ +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 = " \ ${systemd_unitdir}/system/wan-initialized.target \ ${systemd_unitdir}/system/wan-initialized.path \ ${systemd_unitdir}/system/CcspTelemetry.service \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend index 9b5f50c0..c36c8cb1 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend @@ -28,16 +28,8 @@ do_install:append () { SYSTEMD_SERVICE:${PN}:append = " webpabroadband.service" -FILES:${PN} += "${libdir}/libprivilege.so.*" -FILES:${PN}-dev += " \ - ${libdir}/libprivilege.so \ - ${libdir}/libprivilege.a \ -" - -FILES:${PN}:append = " \ +FILES_${PN}:append = " \ ${systemd_unitdir}/system/webpabroadband.service \ - ${base_libdir}/rdk/* \ + ${base_libdir_native}/rdk/* \ /etc/parodus/* \ - ${bindir}/webpa \ - ${exec_prefix}/ccsp \ " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index b21cc9ba..581a789b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -9,9 +9,8 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_10', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/Bpi_rdkwifilibhostap_2_11_changes.patch', 'file://2.10/Bpi_rdkwifilibhostap_2_10_changes.patch', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -SRC_URI:append:scarthgap = " file://2.11/onewifi_undefine_global.patch" -CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS " do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend new file mode 100644 index 00000000..149c111e --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend @@ -0,0 +1,3 @@ +SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " +SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " + diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend index 36b5ee46..d11ea2e9 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend @@ -1,6 +1,6 @@ RDEPENDS:packagegroup-rdk-ccsp-broadband:remove = " rdk-wifi-hal" -RDEPENDS:packagegroup-rdk-ccsp-broadband:append = " \ +RDEPENDS_packagegroup-rdk-ccsp-broadband:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'rdk-wifi-hal', '' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', 'cpuprocanalyzer', ' ', d)} \ " diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index 32d4a13f..a4d2548f 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -18,3 +18,9 @@ if [ $? -eq 0 ];then \ done \ fi' ${D}${sbindir}/init-bridge.sh } + +#ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone +SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" +do_install:append_broadband () { + rm ${D}${systemd_unitdir}/system/usb-mount@.service +} diff --git a/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend new file mode 100644 index 00000000..05ae856a --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-extended/iptables/iptables_1.8.7.bbappend @@ -0,0 +1,7 @@ +RRECOMMENDS_${PN}:append += "kernel-module-xt-nat \ + kernel-module-ipt-trigger" + + +FILESEXTRAPATHS:prepend:="${THISDIR}/files:" + +SRC_URI:append = "file://0001-add-port-triggering-support.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend index 52cac384..3379c267 100644 --- a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend @@ -1,25 +1,24 @@ LDFLAGS:append = " -Wl,--no-as-needed -lm -llog4c -lrdkloggers" inherit systemd coverity - + SRC_URI:append = " \ ${CMF_GIT_ROOT}/rdk/devices/raspberrypi/webpa-client;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/devices;name=rdkbbpi \ " SRCREV_rdkbbpi = "${AUTOREV}" do_fetch[vardeps] += "SRCREV_rdkbbpi" SRCREV_FORMAT .= "_rdkbbpi" - + do_install:append () { install -d ${D}${systemd_unitdir}/system - install -d ${D}${base_libdir} - install -d ${D}${base_libdir}/rdk + install -d ${D}${base_libdir_native}/rdk install -m 0644 ${S}/devices/broadband/parodus/systemd/parodus.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir}/rdk - sed -i "s/eth0/lan0/g" ${D}${base_libdir}/rdk/parodus_start.sh + install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir_native}/rdk + sed -i "s/eth0/lan0/g" ${D}${base_libdir_native}/rdk/parodus_start.sh } -SYSTEMD_SERVICE:${PN}:append = " parodus.service" - -FILES:${PN}:append = " \ +SYSTEMD_SERVICE_${PN}:append = " parodus.service" + +FILES_${PN}:append = " \ ${systemd_unitdir}/system/parodus.service \ - ${base_libdir}/rdk/* \ + ${base_libdir_native}/rdk/* \ " diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 7a6bee8d..f69dc692 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -60,6 +60,24 @@ sed -i '203 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia.bbappen touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia_changes_applied fi +if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied ]; then +sed -i '9 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '10 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '11 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '12 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '13 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '14 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '15 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '16 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +sed -i '17 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend +touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied +fi + +if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied ]; then +sed -i 's/^SRC_URI +=/SRC_URI:append =/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied +fi + # commenting removing dbus.service from meta-cmf-filogic if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change ]; then sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_%.bbappend From 72c1b06ee1f26b11cabc554ba0b8da3c43e17452 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 13 Aug 2025 19:47:07 +0000 Subject: [PATCH 28/43] RDKBACCL-966 : Changes for OSS consumption build --- conf/machine/bananapi4-rdk-broadband.conf | 4 ++++ .../trusted-firmware-a/bootloader_prebuild.bb | 12 +----------- .../rdk-wifi-libhostap.bbappend | 2 +- .../busybox/busybox_1.36.1.bbappend | 4 ++++ .../recipes-core/dbus/dbus_%.bbappend | 2 ++ setup-environment-refboard-rdkb | 18 ------------------ 6 files changed, 12 insertions(+), 30 deletions(-) create mode 100644 meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 4eb10b26..c363bd0b 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -13,6 +13,9 @@ 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" +#UBOOT_MACHINE = "bananapi_m64_defconfig" +#UBOOT_MACHINE = "mt7988_bpir4_defconfig" # Ensure DTBs are built and packaged KERNEL_DEVICETREE = "mediatek/mt7988a-bananapi-bpi-r4.dtb" @@ -27,3 +30,4 @@ DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable" MACHINEOVERRIDES .= ":broadband" KERNEL_CLASSES:remove = "itb-image" +DISTRO_FEATURES:append = " rdkoss" diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index e8c8a947..065ca409 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -17,17 +17,7 @@ do_configure[noexec] = "1" # since there is no 'main' package generated (empty) RDEPENDS:${PN}-dev = "" -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) -} -SRC_URI:append += " file://bpi-r4_sdmmc_bl2.img \ +SRC_URI += " file://bpi-r4_sdmmc_bl2.img \ file://bpi-r4_sdmmc_fip.bin" do_deploy() { diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 581a789b..0ec9f23b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -10,7 +10,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ diff --git a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend new file mode 100644 index 00000000..b6109530 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend @@ -0,0 +1,4 @@ + +SRC_URI:remove = "file://0001-add-ENABLE_FEATURE_SYSTEMD-and-use-it-in-syslogd.patch \ + file://busybox-1.31-ping-mdev-support.patch \ + " diff --git a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend new file mode 100644 index 00000000..7efa389e --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend @@ -0,0 +1,2 @@ +SRC_URI:remove = "file://01-dbus-ccsp-apis-1.14.8.patch \ + " diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index f69dc692..7a6bee8d 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -60,24 +60,6 @@ sed -i '203 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia.bbappen touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia_changes_applied fi -if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied ]; then -sed -i '9 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '10 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '11 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '12 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '13 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '14 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '15 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '16 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -sed -i '17 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdk-wifi-hal.bbappend -touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/hal/rdkwifihal_changes_applied -fi - -if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied ]; then -sed -i 's/^SRC_URI +=/SRC_URI:append =/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend -touch ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/ccsp/onewifi_changes_applied -fi - # commenting removing dbus.service from meta-cmf-filogic if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change ]; then sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_%.bbappend From 59ed7a503a7adf4fc9617509837fe40006822cb3 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 8 Oct 2025 18:01:50 +0000 Subject: [PATCH 29/43] RDKBACCL-1156: Build RDKB generic image --- conf/machine/bananapi4-rdk-broadband.conf | 3 --- .../trusted-firmware-a/bootloader_prebuild.bb | 12 +++++++-- .../ccsp/ccsp-common-library.bbappend | 26 +++++++++---------- .../recipes-ccsp/ccsp/ccsp-lm-lite.bbappend | 1 + .../recipes-ccsp/ccsp/ccsp-misc.bbappend | 2 +- .../ccsp/ccsp-one-wifi-libwebconfig.bbappend | 5 +--- .../recipes-ccsp/ccsp/ccsp-p-and-m.bbappend | 6 +---- .../recipes-ccsp/ccsp/ccsp-xdns.bbappend | 2 +- .../recipes-ccsp/ccsp/parodus2ccsp.bbappend | 12 +++++++-- .../recipes-ccsp/util/utopia.bbappend | 6 +++++ .../lighttpd/lighttpd_1.4.53.bbappend | 4 +-- .../wpa-supplicant/wpa-supplicant_%.bbappend | 1 + .../recipes-core/dbus/dbus_%.bbappend | 2 -- .../packagegroup-rdk-ccsp-broadband.bbappend | 2 +- .../init-filogic/init-filogic.bbappend | 9 ++++--- .../recipes-kernel/linux/files/netfilter.cfg | 2 ++ .../linux/linux-mediatek_%.bbappend | 2 ++ .../parodus/parodus_1.0.bbappend | 15 ++++++----- 18 files changed, 65 insertions(+), 47 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index c363bd0b..65e57a2c 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -14,8 +14,6 @@ PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic" 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" -#UBOOT_MACHINE = "bananapi_m64_defconfig" -#UBOOT_MACHINE = "mt7988_bpir4_defconfig" # Ensure DTBs are built and packaged KERNEL_DEVICETREE = "mediatek/mt7988a-bananapi-bpi-r4.dtb" @@ -30,4 +28,3 @@ DISTRO_FEATURES:append = " rdkoss WanFailOverSupportEnable" MACHINEOVERRIDES .= ":broadband" KERNEL_CLASSES:remove = "itb-image" -DISTRO_FEATURES:append = " rdkoss" diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index 065ca409..e9d30b2d 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -17,8 +17,16 @@ do_configure[noexec] = "1" # since there is no 'main' package generated (empty) RDEPENDS:${PN}-dev = "" -SRC_URI += " 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.img') + dst_bl2 = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_bl2.img') + shutil.copyfile(src_bl2, dst_bl2) + + src_fip = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_fip.bin') + dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip.bin') + shutil.copyfile(src_fip, dst_fip) +} do_deploy() { mkdir -p ${DEPLOYDIR}/atf/ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index c8b90395..3c047900 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -63,20 +63,20 @@ TARGET_CFLAGS += " \ -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 \ diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend index 8527f06e..32f73404 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-lm-lite.bbappend @@ -3,4 +3,5 @@ include ccsp_common_bananapi.inc EXTRA_OEMAKE += "LIBS='-lrbus'" #FILES:${PN}-dev += "${libdir}/*.so" +FILES:${PN}-dev += "${libdir}/*.so" INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend index 01f6cfc2..11e986b1 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-misc.bbappend @@ -4,4 +4,4 @@ CFLAGS_aarch64:append = "-Werror=format-truncation=1" CFLAGS += " -DDHCPV4_CLIENT_UDHCPC -DDHCPV6_CLIENT_DIBBLER -DUDHCPC_RUN_IN_BACKGROUND" -INSANE_SKIP:${PN} += "dev-so" +FILES:${PN}-dev += "${libdir}/*.so" 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 index ee343f78..ba683111 100644 --- 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 @@ -23,9 +23,6 @@ do_install:append() { FILES:${PN} += " \ ${libdir}/libwifi_bus.so.* \ " -FILES:${PN} += " \ - ${libdir}/*so \ -" FILES_SOLIBSDEV = "" -INSANE_SKIP:${PN} += "dev-so" +INSANE_SKIP_${PN} += "dev-so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend index 2584220e..92d70873 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend @@ -1,7 +1,3 @@ include ccsp_common_bananapi.inc -#FILES:${PN}-dev += "${libdir}/*.so" -INSANE_SKIP:${PN} += "dev-so" - -SRC_URI:remove = "file://filogic-factoryReset.patch" - +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend index 45d80cd5..de9015fc 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-xdns.bbappend @@ -1,4 +1,4 @@ include ccsp_common_bananapi.inc TARGET_CFLAGS += "-Wno-error=address" -INSANE_SKIP:${PN} += "dev-so" +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend index c36c8cb1..9b5f50c0 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/parodus2ccsp.bbappend @@ -28,8 +28,16 @@ do_install:append () { SYSTEMD_SERVICE:${PN}:append = " webpabroadband.service" -FILES_${PN}:append = " \ +FILES:${PN} += "${libdir}/libprivilege.so.*" +FILES:${PN}-dev += " \ + ${libdir}/libprivilege.so \ + ${libdir}/libprivilege.a \ +" + +FILES:${PN}:append = " \ ${systemd_unitdir}/system/webpabroadband.service \ - ${base_libdir_native}/rdk/* \ + ${base_libdir}/rdk/* \ /etc/parodus/* \ + ${bindir}/webpa \ + ${exec_prefix}/ccsp \ " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index c3684c43..9c9499eb 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -11,6 +11,11 @@ do_install:append() { #install -d ${D}${sysconfdir}/utopia/service.d install -d -m 0777 ${D}/minidumps #install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ +install -d ${D}${sysconfdir}/ +install -d ${D}${sysconfdir}/utopia/ +install -d ${D}${sysconfdir}/utopia/service.d +install -d -m 0777 ${D}/minidumps +install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}" if [ $DISTRO_WAN_ENABLED = 'true' ]; then @@ -102,3 +107,4 @@ FILES:${PN} += " \ FILES:${PN} += "${libdir}/*.so" INSANE_SKIP:${PN} += "dev-so" +FILES:${PN}-dev += "${libdir}/*.so" diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend index 149c111e..a89ee3e6 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend @@ -1,3 +1,3 @@ -SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " -SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " +#SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " +#SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " 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 index 0c281fe2..cff882ea 100644 --- 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,6 +1,7 @@ EXTRA_OEMAKE = "CONFIG_BUILD_WPA_CLIENT_SO=y" FILES_SOLIBSDEV = "" +SRCREV = "${SRCREV_kernel6-6}" do_install:append () { install -d ${D}${includedir} diff --git a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend b/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend deleted file mode 100644 index 7efa389e..00000000 --- a/meta-rdk-mtk-bpir4/recipes-core/dbus/dbus_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -SRC_URI:remove = "file://01-dbus-ccsp-apis-1.14.8.patch \ - " diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend index d11ea2e9..36b5ee46 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend @@ -1,6 +1,6 @@ RDEPENDS:packagegroup-rdk-ccsp-broadband:remove = " rdk-wifi-hal" -RDEPENDS_packagegroup-rdk-ccsp-broadband:append = " \ +RDEPENDS:packagegroup-rdk-ccsp-broadband:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'rdk-wifi-hal', '' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'CPUPROCANALYZER_BROADBAND', 'cpuprocanalyzer', ' ', d)} \ " diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index a4d2548f..f673f557 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -20,7 +20,8 @@ fi' ${D}${sbindir}/init-bridge.sh } #ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone -SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" -do_install:append_broadband () { - rm ${D}${systemd_unitdir}/system/usb-mount@.service -} +#SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" +#do_install:append_broadband () { +# rm ${D}${systemd_unitdir}/system/usb-mount@.service +#} + diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index 67f25742..d98c65b8 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -64,3 +64,5 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m CONFIG_IP_NF_TARGET_TRIGGER=n +CONFIG_NET_DSA=y +CONFIG_NET_DSA_AN8855=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 2b9cfc56..5d01887f 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -56,3 +56,5 @@ do_install:append() { } CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" + +#IMAGE_INSTALL:append = " kernel-dev" diff --git a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend index 3379c267..985ca530 100644 --- a/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-support/parodus/parodus_1.0.bbappend @@ -10,15 +10,16 @@ SRCREV_FORMAT .= "_rdkbbpi" do_install:append () { install -d ${D}${systemd_unitdir}/system - install -d ${D}${base_libdir_native}/rdk + install -d ${D}${base_libdir} + install -d ${D}${base_libdir}/rdk install -m 0644 ${S}/devices/broadband/parodus/systemd/parodus.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir_native}/rdk - sed -i "s/eth0/lan0/g" ${D}${base_libdir_native}/rdk/parodus_start.sh + install -m 0755 ${S}/devices/broadband/parodus/scripts/parodus_start.sh ${D}${base_libdir}/rdk + sed -i "s/eth0/lan0/g" ${D}${base_libdir}/rdk/parodus_start.sh } -SYSTEMD_SERVICE_${PN}:append = " parodus.service" - -FILES_${PN}:append = " \ +SYSTEMD_SERVICE:${PN}:append = " parodus.service" + +FILES:${PN}:append = " \ ${systemd_unitdir}/system/parodus.service \ - ${base_libdir_native}/rdk/* \ + ${base_libdir}/rdk/* \ " From 7591426c40fa5b5a94c7de08c59ebbd362c2df31 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Tue, 14 Oct 2025 15:48:19 +0000 Subject: [PATCH 30/43] RDKBACCL-1156: Build RDKB generic image - Addressing Review comment Signed-off-by: ssiras826 --- .../recipes-devtools/init-filogic/init-filogic.bbappend | 7 ------- .../recipes-kernel/linux/files/netfilter.cfg | 2 -- .../recipes-kernel/linux/linux-mediatek_%.bbappend | 2 -- 3 files changed, 11 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend index f673f557..32d4a13f 100644 --- a/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend @@ -18,10 +18,3 @@ if [ $? -eq 0 ];then \ done \ fi' ${D}${sbindir}/init-bridge.sh } - -#ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone -#SYSTEMD_SERVICE:${PN}:remove = "usb-mount@.service" -#do_install:append_broadband () { -# rm ${D}${systemd_unitdir}/system/usb-mount@.service -#} - diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg index d98c65b8..67f25742 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg @@ -64,5 +64,3 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m CONFIG_IP_NF_TARGET_TRIGGER=n -CONFIG_NET_DSA=y -CONFIG_NET_DSA_AN8855=y diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 5d01887f..2b9cfc56 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -56,5 +56,3 @@ do_install:append() { } CMDLINE:append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" - -#IMAGE_INSTALL:append = " kernel-dev" From c468cac1317f8b8e1e94c6516f2d2561e9a622bc Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Wed, 22 Oct 2025 16:45:03 +0530 Subject: [PATCH 31/43] RDKBACCL-1077 : Scarthgap - virtual/kernel build for kernel-6.6 filogic SDK Reason for change : Updated the changes of kernel-6.6 to scarthgap feature branch Test Procedure : None Risks: None Signed-off-by: ssiras826 --- conf/machine/bananapi4-rdk-broadband.conf | 1 - .../rdk-wifi-libhostap.bbappend | 2 +- .../rdk-generic-broadband-image.bbappend | 20 ++----------------- .../linux/files/enable_sdcard_6_6.patch | 4 ++++ .../linux/linux-mediatek_%.bbappend | 10 ++++++---- setup-environment-refboard-rdkb | 3 +-- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 65e57a2c..4eb10b26 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -13,7 +13,6 @@ 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" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 0ec9f23b..83c31f2a 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -10,7 +10,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" -CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " +CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " do_configure:prepend() { cp ${WORKDIR}/2.11/libhostap.mk ${S}/source/hostap-${HOSTAPD_PV}/hostapd/ 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 index f88d35cd..51ac713b 100644 --- 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 @@ -23,30 +23,15 @@ add_busybox_fixes() { } do_filogic_gen_image(){ - SQUASHFS_FILE_PATH="${SQUASHFS_FILE_PATH}" # ensure exported - if [ -z "$SQUASHFS_FILE_PATH" ]; then - # fallback: check both possibilities - if [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" ]; then - SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" - elif [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" ]; then - SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" - else - echo "ERROR: no squashfs file found" - exit 1 - fi - fi if ${@bb.utils.contains('DISTRO_FEATURES','kernel_in_ubi','true','false',d)}; then # create sysupgrade image align to openwrt - # Use dynamically detected squashfs path - SQUASHFS_FILE="${IMGDEPLOYDIR}/$(basename ${SQUASHFS_FILE_PATH})" rm -rf ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} rm -rf ${IMGDEPLOYDIR}/${PN}-${MACHINE}-sysupgrade.bin mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} cp ${DEPLOY_DIR_IMAGE}/fitImage ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel - #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root - cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root fi @@ -61,8 +46,7 @@ do_filogic_gen_image(){ mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb cp ${DEPLOY_DIR_IMAGE}/fitImage-sb ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel - #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root - cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root fi diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch index 20159ae5..4d2f442d 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/files/enable_sdcard_6_6.patch @@ -13,6 +13,7 @@ index c4455fbc..dd3bd8b1 100644 memory { @@ -75,6 +74,15 @@ +@@ -75,6 +75,15 @@ default-state = "off"; }; }; @@ -29,6 +30,7 @@ index c4455fbc..dd3bd8b1 100644 ð { @@ -102,7 +110,7 @@ +@@ -102,7 +111,7 @@ }; &gsw_port0 { @@ -38,6 +40,7 @@ index c4455fbc..dd3bd8b1 100644 &gsw_phy0_led0 { @@ -304,6 +312,20 @@ +@@ -304,6 +313,20 @@ function = "pwm"; }; }; @@ -70,6 +73,7 @@ index c4455fbc..dd3bd8b1 100644 status = "okay"; }; @@ -402,3 +428,18 @@ +@@ -402,3 +425,18 @@ &xphy { status = "okay"; }; diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 2b9cfc56..f9c1dad8 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -23,13 +23,15 @@ KERNEL_CONFIG_FRAGMENTS += " \ do_filogic_patches:append() { cd ${S} + Enable_sd_6_6="${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}" if [ ! -e patch_applied_6_6 ]; then - if ${@bb.utils.contains('DISTRO_FEATURES', 'sdmmc', 'true', 'false', d)}; then - patch -p1 < ${WORKDIR}/enable_sdcard_6_6.patch - touch patch_applied_6_6 - fi + if [ $Enable_sd_6_6 = 'true' ]; then + patch -p1 < ${WORKDIR}/enable_sdcard_6_6.patch + fi + touch patch_applied_6_6 fi } + # Ensure DTBs are built even if we're using fitImage do_compile:append() { if [ -n "${KERNEL_DEVICETREE}" ]; then diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 7a6bee8d..212ae95e 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -80,7 +80,7 @@ if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc else # SD card image is default mkdir -p ${_TOPDIR}/downloads - if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_6-6.bin ]; then + if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_6-6.bin ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_B_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_B_6-6.bin ]; then echo "Both bl2 and fip binaries are present in local workspace for 6.6 kernel." else echo "**********************************************************************" @@ -88,6 +88,5 @@ else # SD card image is default echo "> The BL2 and FIP binaries for kernel-6.6 aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)" echo "**********************************************************************" return 1 - fi fi From c9bba9961fac313cc237ddde45fd70adc7839e4d Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 3 Nov 2025 06:05:36 +0000 Subject: [PATCH 32/43] RDKBACCL-1034 : Scarthgap - patch recreate for OSS build Reason for change : Addressing FUZZ patch error for ucode and compilation issues of dobby Test Procedure : bitbake dobby;bitbake ucode Risk : None Signed-off-by: ssiras826 --- .../recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb index e9d30b2d..27836f0a 100644 --- a/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb +++ b/meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb @@ -19,12 +19,12 @@ RDEPENDS:${PN}-dev = "" python do_unpack:append() { import shutil, os - src_bl2 = os.path.join(d.getVar('DL_DIR'), 'bpi-r4_sdmmc_bl2.img') - dst_bl2 = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_bl2.img') + 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.bin') - dst_fip = os.path.join(d.getVar('WORKDIR'), 'bpi-r4_sdmmc_fip.bin') + 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) } From bbac8501f379d6020e934580c98456cb9976ea48 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Tue, 4 Nov 2025 18:29:56 +0530 Subject: [PATCH 33/43] RDKBACCL-1210 : Addressing build issues in meta-cmf-bananapi layer Reason for change : addressing incomplete typedef for ecryptfs-utils Test Procedure : bitbake ecryptfs-utils should not throw incomplete typedef Risks: None Signed-off-by: ssiras826 --- .../ecryptfs-utils/ecryptfs-utils_%.bbappend | 2 + .../files/typedef_error_scarthgap.patch | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend create mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend new file mode 100644 index 00000000..83fc1eee --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append:scarthgap = " file://typedef_error_scarthgap.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch new file mode 100644 index 00000000..198dac30 --- /dev/null +++ b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch @@ -0,0 +1,41 @@ +diff -Naur ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c +--- ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:43:26.832537641 +0000 ++++ ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:47:12.410605053 +0000 +@@ -145,6 +145,8 @@ + unsigned char *hash; + unsigned char *data = NULL; + int rc = 0; ++ const BIGNUM *n = NULL; ++ const BIGNUM *e = NULL; + + hash = malloc(SHA_DIGEST_LENGTH); + if (!hash) { +@@ -152,11 +154,12 @@ + rc = -ENOMEM; + goto out; + } +- nbits = BN_num_bits(key->n); ++ RSA_get0_key(key, &n, &e, NULL); ++ nbits = BN_num_bits(n); + nbytes = nbits / 8; + if (nbits % 8) + nbytes++; +- ebits = BN_num_bits(key->e); ++ ebits = BN_num_bits(e); + ebytes = ebits / 8; + if (ebits % 8) + ebytes++; +@@ -179,11 +182,11 @@ + data[i++] = '\02'; + data[i++] = (nbits >> 8); + data[i++] = nbits; +- BN_bn2bin(key->n, &(data[i])); ++ BN_bn2bin(n, &(data[i])); + i += nbytes; + data[i++] = (ebits >> 8); + data[i++] = ebits; +- BN_bn2bin(key->e, &(data[i])); ++ BN_bn2bin(e, &(data[i])); + i += ebytes; + SHA1(data, len + 3, hash); + to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); From a94d0cdc4df7ded9d5f6058945eaeec87060c57a Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 6 Nov 2025 12:04:01 +0000 Subject: [PATCH 34/43] RDKBACCL-1034 : Scarthgap - patch recreate for OSS build Reason for Change: Addressing FUZZ patch error for mii-mgr and hunk error for dropbear , ecryptfs-utils patch is not requiref after incoparating the kirkstone patch to scarthgap as well Test Procedure: bitbake mii-mgr;bitbake dropbear Risks: Low Signed-off-by: ssiras826 --- .../ecryptfs-utils/ecryptfs-utils_%.bbappend | 2 - .../files/typedef_error_scarthgap.patch | 41 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend delete mode 100644 meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend deleted file mode 100644 index 83fc1eee..00000000 --- a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/ecryptfs-utils_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append:scarthgap = " file://typedef_error_scarthgap.patch" diff --git a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch b/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch deleted file mode 100644 index 198dac30..00000000 --- a/meta-rdk-mtk-bpir4/recipes-support/ecryptfs-utils/files/typedef_error_scarthgap.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c ---- ecryptfs-utils-106-origin/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:43:26.832537641 +0000 -+++ ecryptfs-utils-106/src/key_mod/ecryptfs_key_mod_openssl.c 2025-11-03 08:47:12.410605053 +0000 -@@ -145,6 +145,8 @@ - unsigned char *hash; - unsigned char *data = NULL; - int rc = 0; -+ const BIGNUM *n = NULL; -+ const BIGNUM *e = NULL; - - hash = malloc(SHA_DIGEST_LENGTH); - if (!hash) { -@@ -152,11 +154,12 @@ - rc = -ENOMEM; - goto out; - } -- nbits = BN_num_bits(key->n); -+ RSA_get0_key(key, &n, &e, NULL); -+ nbits = BN_num_bits(n); - nbytes = nbits / 8; - if (nbits % 8) - nbytes++; -- ebits = BN_num_bits(key->e); -+ ebits = BN_num_bits(e); - ebytes = ebits / 8; - if (ebits % 8) - ebytes++; -@@ -179,11 +182,11 @@ - data[i++] = '\02'; - data[i++] = (nbits >> 8); - data[i++] = nbits; -- BN_bn2bin(key->n, &(data[i])); -+ BN_bn2bin(n, &(data[i])); - i += nbytes; - data[i++] = (ebits >> 8); - data[i++] = ebits; -- BN_bn2bin(key->e, &(data[i])); -+ BN_bn2bin(e, &(data[i])); - i += ebytes; - SHA1(data, len + 3, hash); - to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); From 4f0ccee48b16b555511b09aa588cd372c99fe3bd Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 6 Nov 2025 13:01:37 +0000 Subject: [PATCH 35/43] RDKBACCL-1210 : Addressing build issues in meta-cmf-bananapi layer Reason for change : Addressing build issues ccsp-onewifi, rdk-wanmanager,mt76-test,ipoe-health-check Test Procedure : bitbake ccsp-one-wifi Risk : None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 6 +----- .../recipes-ccsp/ccsp/rdk-wanmanager.bbappend | 3 ++- .../packagegroups/packagegroup-filogic-mt76.bbappend | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) 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 index 5e73026f..5dd14ed6 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -47,8 +47,4 @@ FILES:${PN} += " \ /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" - +INSANE_SKIP:${PN} += "file-rdeps" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend index 9b76e52f..73d568c2 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend @@ -1,2 +1,3 @@ include ccsp_common_bananapi.inc -RDEPENDS:${PN} += " msgpack-c" +RDEPENDS_${PN} += "ndisc6" +INSANE_SKIP:${PN} += "file-rdeps" 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 index bdc331bf..0d76106d 100644 --- a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-filogic-mt76.bbappend @@ -3,5 +3,8 @@ RDEPENDS:packagegroup-filogic-mt76:remove:onewifi = " \ usteer \ wifi-test-tool \ vts \ + iwinfo \ + uci \ + ubus \ " RDEPENDS:packagegroup-filogic-mt76:remove:broadband = " mt76-test" From 42b4f752bdc974bb6620d332396febf278629a7f Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Tue, 11 Nov 2025 18:36:10 +0000 Subject: [PATCH 36/43] RDKBACCL-1034: Recreated busybox patch in OSS layer --- .../recipes-core/busybox/busybox_1.36.1.bbappend | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend b/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend deleted file mode 100644 index b6109530..00000000 --- a/meta-rdk-mtk-bpir4/recipes-core/busybox/busybox_1.36.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ - -SRC_URI:remove = "file://0001-add-ENABLE_FEATURE_SYSTEMD-and-use-it-in-syslogd.patch \ - file://busybox-1.31-ping-mdev-support.patch \ - " From 96f28428289a12f3e0eb9716b0b57266d02546f7 Mon Sep 17 00:00:00 2001 From: "sipra.s" Date: Wed, 12 Nov 2025 19:37:03 +0000 Subject: [PATCH 37/43] RDKBACCL-1034: Recreate lighttpd patch in OSS layer, remove not required patch --- .../recipes-common/lighttpd/lighttpd_1.4.53.bbappend | 3 --- .../recipes-common/lighttpd/lighttpd_1.4.74.bbappend | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend deleted file mode 100644 index a89ee3e6..00000000 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.53.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -#SRC_URI:remove:broadband += " file://lighttpd_jst.conf_broadband " -#SRC_URI:remove:broadband += " file://lighttpd_php.conf_broadband " - diff --git a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend index cf3f8923..474c24d9 100644 --- a/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-common/lighttpd/lighttpd_1.4.74.bbappend @@ -1,4 +1 @@ -SRC_URI:remove:scarthgap += " file://0001-Force-UTC-for-lighttpd-log-messages.patch " -do_install:append(){ -sed -i '$ a include_shell "sh /etc/webgui_config.sh"' ${D}${sysconfdir}/lighttpd.conf -} +SRC_URI:remove:scarthgap = " file://0001-Force-UTC-for-lighttpd-log-messages.patch " From 92519c93a8196ebcaa1a17e1720eb547f003ef34 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 17 Nov 2025 07:15:19 +0000 Subject: [PATCH 38/43] RDKBACCL-1237 : do_rootfs issue is seen for rdk-generic-broadband-image Reason for change : observed do_hash_rootfs error for squashfs.xz Test Procedure : bitbake rdk-generic-broadband-image should not throw No such file or directory: for rdk-generic-broadband-image-bananapi4-rdk-broadband.squashfs-xz Risks: None Signed-off-by: ssiras826 --- .../rdk-generic-broadband-image.bbappend | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) 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 index 51ac713b..fa63240c 100644 --- 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 @@ -21,17 +21,36 @@ add_busybox_fixes() { cd - fi } +python __anonymous () { + if "sd" in d.getVar('MACHINEOVERRIDES', True): + d.setVar('do_filogic_gen_image', 'do_filogic_gen_image_sdcard') +} -do_filogic_gen_image(){ +do_filogic_gen_image_sdcard(){ + SQUASHFS_FILE_PATH="${SQUASHFS_FILE_PATH}" # ensure exported + if [ -z "$SQUASHFS_FILE_PATH" ]; then + # fallback: check both possibilities + if [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" ]; then + SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.bin.squashfs-xz" + elif [ -f "${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" ]; then + SQUASHFS_FILE_PATH="${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz" + else + echo "ERROR: no squashfs file found" + exit 1 + fi + fi if ${@bb.utils.contains('DISTRO_FEATURES','kernel_in_ubi','true','false',d)}; then # create sysupgrade image align to openwrt + # Use dynamically detected squashfs path + SQUASHFS_FILE="${IMGDEPLOYDIR}/$(basename ${SQUASHFS_FILE_PATH})" rm -rf ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} rm -rf ${IMGDEPLOYDIR}/${PN}-${MACHINE}-sysupgrade.bin mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE} cp ${DEPLOY_DIR_IMAGE}/fitImage ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel - cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root + cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root fi @@ -46,7 +65,8 @@ do_filogic_gen_image(){ mkdir ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb cp ${DEPLOY_DIR_IMAGE}/fitImage-sb ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel - cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + #cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root + cp ${SQUASHFS_FILE} ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root fi From 4da5192a1da57521e70d8c58b8005e29fa8d9f42 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Mon, 17 Nov 2025 09:34:46 +0000 Subject: [PATCH 39/43] RDKBACCL-1259 : Address [file-rdeps] packages and compilation errors Reason for change : Addressed some of skipping file-rdeps with proper fix and compilation error with respect to onewifi and remving mt76-test Test Procedure : bitbake ccsp-one-wifi;bitbake rdk-wanmanager;bitbake rdk-wifi-libhostap ;bitbake atenl Risks: None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 2 +- .../recipes-ccsp/ccsp/rdk-wanmanager.bbappend | 2 +- .../rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend | 1 + .../images/rdk-generic-broadband-image.bbappend | 6 +----- setup-environment-refboard-rdkb | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) 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 index 5dd14ed6..6da94bd0 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -47,4 +47,4 @@ FILES:${PN} += " \ /usr/bin/wifi_events_consumer \ /nvram/wifi_defaults.txt \ " -INSANE_SKIP:${PN} += "file-rdeps" +RDEPENDS:${PN} += "msgpack-c" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend index 73d568c2..72d48b8b 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdk-wanmanager.bbappend @@ -1,3 +1,3 @@ include ccsp_common_bananapi.inc RDEPENDS_${PN} += "ndisc6" -INSANE_SKIP:${PN} += "file-rdeps" +RDEPENDS:${PN} += " msgpack-c" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend index 83c31f2a..b21cc9ba 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap.bbappend @@ -9,6 +9,7 @@ SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_10', 'file SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/Bpi_rdkwifilibhostap_2_11_changes.patch', 'file://2.10/Bpi_rdkwifilibhostap_2_10_changes.patch', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/supplicant.patch', '', d)}" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'HOSTAPD_2_11', 'file://2.11/libhostap.mk', '', d)}" +SRC_URI:append:scarthgap = " file://2.11/onewifi_undefine_global.patch" CFLAGS:append = " -D_PLATFORM_BANANAPI_R4_ -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP " 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 index fa63240c..f88d35cd 100644 --- 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 @@ -21,12 +21,8 @@ add_busybox_fixes() { cd - fi } -python __anonymous () { - if "sd" in d.getVar('MACHINEOVERRIDES', True): - d.setVar('do_filogic_gen_image', 'do_filogic_gen_image_sdcard') -} -do_filogic_gen_image_sdcard(){ +do_filogic_gen_image(){ SQUASHFS_FILE_PATH="${SQUASHFS_FILE_PATH}" # ensure exported if [ -z "$SQUASHFS_FILE_PATH" ]; then # fallback: check both possibilities diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index 212ae95e..ecdbb18e 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -88,5 +88,6 @@ else # SD card image is default echo "> The BL2 and FIP binaries for kernel-6.6 aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)" echo "**********************************************************************" return 1 + fi fi From 82075b8ea075c6639e622019d1cae2db39c640a7 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 06:14:14 +0000 Subject: [PATCH 40/43] RDKBACCL-1265 : erouter0 interface is not coming in scarthgap Reason for change : due to low priority of cmf-bananapi component recipe contents are override or not installed Test Procedure : Flash the scarthgap, check whether erouter0 is getting ip Risks: None Signed-off-by: ssiras826 --- .../recipes-ccsp/ccsp/ccsp-common-library.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend index 3c047900..fa691dcc 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend @@ -6,7 +6,7 @@ SRC_URI:append = " \ " 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 @@ -63,7 +63,7 @@ TARGET_CFLAGS += " \ -Wno-error=format-truncation \ " -SYSTEMD_SERVICE:${PN}:remove_onewifi = " ccspwifiagent.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" @@ -73,7 +73,7 @@ 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: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} += "\ From 63e13fe99cb3afea0637ac7bcfd55a0cf2b6c63b Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 07:10:52 +0000 Subject: [PATCH 41/43] RDKBACCL-1273 : All ccsp logs are missed under rdklogs/logs folder Reason for change : In scarthgap builds,through this utopia.bbapend scripts installed newly losing the modified content Test Procedure : Flash the scarthgap, check /rdklogs/logs whether all log file are generated Risks: None Signed-off-by: ssiras826 --- meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend index 9c9499eb..cf5095ee 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend @@ -11,11 +11,6 @@ do_install:append() { #install -d ${D}${sysconfdir}/utopia/service.d install -d -m 0777 ${D}/minidumps #install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ -install -d ${D}${sysconfdir}/ -install -d ${D}${sysconfdir}/utopia/ -install -d ${D}${sysconfdir}/utopia/service.d -install -d -m 0777 ${D}/minidumps -install -m 755 ${S}/source/scripts/init/system/utopia_init.sh ${D}${sysconfdir}/utopia/ DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}" if [ $DISTRO_WAN_ENABLED = 'true' ]; then From 969927642f0ce9aa61f6b2ef756b62515511237c Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Fri, 21 Nov 2025 07:26:42 +0000 Subject: [PATCH 42/43] RDKBACCL-1274 : Scarthgap image is not booting up Reason for change : in scarthgap image, kernel is trying to mount the rootfs to ubi Test Procedure : Flash the scarthgap in different boards Risks: None Signed-off-by: ssiras826 From 06c8c86ea33510dc5c70d606b5f69e89dc8b9300 Mon Sep 17 00:00:00 2001 From: ssiras826 Date: Thu, 4 Dec 2025 11:33:47 +0000 Subject: [PATCH 43/43] RDKBACCL-1316 : Addressing missing lib*.so files for scarthgap rootfs Reason for change : To bring missed lib*so by removing under {PN}-dev for rootfs Test Procedure : check whether rootfs have these respective files and wifi testing Risks: None Signed-off-by: ssiras826 --- .../recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend | 5 ++++- meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend | 4 ++++ meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) 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 index ba683111..ee343f78 100644 --- 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 @@ -23,6 +23,9 @@ do_install:append() { FILES:${PN} += " \ ${libdir}/libwifi_bus.so.* \ " +FILES:${PN} += " \ + ${libdir}/*so \ +" FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" 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 index 6da94bd0..5e73026f 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -48,3 +48,7 @@ FILES:${PN} += " \ /nvram/wifi_defaults.txt \ " RDEPENDS:${PN} += "msgpack-c" +FILES:${PN} += "${libdir}/*.so" +FILES:${PN}-dev:remove = "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" + diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend index 92d70873..2584220e 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend @@ -1,3 +1,7 @@ include ccsp_common_bananapi.inc -FILES:${PN}-dev += "${libdir}/*.so" +#FILES:${PN}-dev += "${libdir}/*.so" +INSANE_SKIP:${PN} += "dev-so" + +SRC_URI:remove = "file://filogic-factoryReset.patch" +