Merge branch 'develop' into RDKBACCL-1103_ipv6_regression

Author: anatar818

meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/files/bpi_custom_device.properties

@@ -0,0 +1,34 @@
+DEVICE_TYPE=broadband
+BUILD_TYPE=dev
+MOCA_INTERFACE=eth0
+ETHERNET_INTERFACE=eth0
+BUILD_VERSION=
+MANUFACTURE=
+LOG_PATH=/rdklogs/logs/
+CORE_PATH=/mnt/memory/corefiles/
+PROCESS_RESTART_LOG=/dev/null
+MESH_SUPPORTED=true
+WAN_TYPE=DOCSIS
+ETH_PORT2_XFINITY_HOME=true
+MOCA_SUPPORTED=false
+DOCSIS_SUPPORTED=true
+BRIDGE_MODE_SUPPORTED=true
+DEVICE_ROUTER=false
+BATTERY_SUPPORTED=true
+WPS_SUPPORTED=true
+VOICE_SUPPORTED=true
+WAN0_IS_DUMMY=false
+WanFailOverSupportEnable=true
+BOX_TYPE=BPI
+ARM_INTERFACE=erouter0
+MODEL_NAME=BPI
+ATOM_INTERFACE=br0
+ATOM_INTERFACE_IP=192.168.101.3
+ATOM_PROXY_SERVER=192.168.101.3
+PARODUS_URL=tcp://127.0.0.1:6666
+WEBPA_CLIENT_URL=tcp://192.168.101.3:6667
+NVRAM2_SUPPORTED=yes
+TFTP_SERVER_IP=35.161.239.220
+PART_SIZE_OFFSET=4194304
+WEBCONFIG_INTERFACE=erouter0
+SERVERURL=https://webpa.rdkcentral.com:8080

meta-rdk-mtk-bpir4/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend

@@ -1,13 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
 SRC_URI_append = "${CMF_GITHUB_ROOT}/bananapi-sysint;protocol=https;nobranch=1;destsuffix=git/devicebpi;name=sysintdevicebpi"
 SRCREV_sysintdevicebpi = "9c9644d7cdb8a50db53b69995d10729192991b21"
 SRCREV_FORMAT = "1.0.0"
 
+SRC_URI += "file://bpi_custom_device.properties"
+
 do_install_append () {
-  #Webpa ServerURL
-  echo "SERVERURL=https://webpa.rdkcentral.com:8080" >> ${D}${sysconfdir}/device.properties
-  echo "Box_Type=bpi" >> ${D}${sysconfdir}/device.properties
-  ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'echo "OneWiFiEnabled=true" >> ${D}${sysconfdir}/device.properties', '', d)}
-  ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender', 'sed -i "s/eth0/brlan0/g" ${D}/lib/rdk/startSSH.sh', '', d)}
+   install -m 644 ${WORKDIR}/bpi_custom_device.properties ${D}${sysconfdir}/device.properties
+   ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'echo "OneWiFiEnabled=true" >> ${D}${sysconfdir}/device.properties', '', d)}
+   ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender', 'sed -i "s/eth0/brlan0/g" ${D}/lib/rdk/startSSH.sh', '', d)}
 
    #self heal support
    rm -rf ${D}/usr/ccsp/tad