Skip to content

Commit 9a8d013

Browse files
authored
Merge branch 'develop' into feature/action-deploy-for/develop
2 parents d802466 + 4c67f33 commit 9a8d013

File tree

5 files changed

+15
-1
lines changed

5 files changed

+15
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ do_install_append_class-target() {
2626
install -D -m 0644 ${S}/systemd_units/wan-initialized.target ${D}${systemd_unitdir}/system/wan-initialized.target
2727
install -D -m 0644 ${S}/systemd_units/wan-initialized.path ${D}${systemd_unitdir}/system/wan-initialized.path
2828
sed -i "s/CcspCrSsp.service CcspPandMSsp.service/CcspCrSsp.service RdkWanManager.service/g" ${D}${systemd_unitdir}/system/CcspEthAgent.service
29+
sed -i "/device.properties/a ExecStartPre=/bin/sh -c '(/usr/ccsp/utopiaInitCheck.sh)'" ${D}${systemd_unitdir}/system/CcspPandMSsp.service
2930
DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}"
3031
if [ $DISTRO_WAN_ENABLED = 'true' ]; then
3132
sed -i "s/After=CcspCrSsp.service utopia.service PsmSsp.service CcspEthAgent.service/After=CcspCrSsp.service PsmSsp.service/g" ${D}${systemd_unitdir}/system/RdkWanManager.service

meta-rdk-mtk-bpir4/recipes-ccsp/unified-wifi-mesh/unified-wifi-mesh-header.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0b1ae637439c7d6f4487fb90163c79a"
55

66
SRC_URI = "git://github.com/rdkcentral/unified-wifi-mesh.git;branch=main;protocol=https;name=Unified-wifi-mesh_header"
77
PV = "git${SRCPV}"
8-
SRCREV_Unified-wifi-mesh_header = "${AUTOREV}"
8+
SRCREV_Unified-wifi-mesh_header = "4eca0f60752cb76a6e5ac86b10ba08e2ce6210bd"
99
SRCREV_FORMAT = "Unified-wifi-mesh_header"
1010
S = "${WORKDIR}/git"
1111

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_ARP=y
2+
CONFIG_CRONTAB=y
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2+
SRC_URI += " file://rdkb.cfg"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Removing ping binary from iputils, since busybox ping is preferred
2+
do_install_append() {
3+
rm -f ${D}${base_bindir}/ping.${BPN}
4+
rm -f ${D}${base_bindir}/ping
5+
}
6+
7+
# Remove iputils-ping package entirely
8+
PACKAGES_remove = "${PN}-ping"
9+
RDEPENDS_${PN}_remove = "${PN}-ping"

0 commit comments

Comments
 (0)