Merge pull request #233 from kpandu987/rdkbaccl-1008

RDKBACCL-1004 : Need to add logic of wifi constant mac for EM builds

Author: cpokuru

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ctrl.sh

@@ -6,23 +6,11 @@ iw phy phy0 interface add wifi1 type __ap
 iw phy phy0 interface add wifi1.1 type __ap
 iw phy phy0 interface add wifi2 type __ap
 
-#Obtain the wifi0 mac address
-wifi0_mac="$(cat /sys/class/ieee80211/phy0/macaddress)"
-#Strip the : and increment mac by 1 to get wifi1 macaddress
-mac=$(echo $wifi0_mac | tr -d ':')
-mac_incr=$((0x$mac + 2))
-wifi1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-mac_incr=$(($mac_incr + 2))
-wifi1_1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-#Increment again by 1 to get wifi2 address
-mac_incr=$(($mac_incr + 2))
-wifi2_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-mac_incr=$(($mac_incr + 2))
-wifi2_1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-#print the mac address
-echo $wifi0_mac
-echo $wifi1_mac
-echo $wifi2_mac
+#Obtain the wifi mac address
+wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2`
+wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
+wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
+wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
 
 #Update the mac address using ip link command
 ifconfig wifi0 down

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ext.sh

@@ -7,26 +7,12 @@ iw phy phy0 interface add wifi1 type __ap
 iw phy phy0 interface add wifi2 type __ap
 iw phy phy0 interface add wifi1.1 type __ap
 
-#Obtain the wifi0 mac address
-wifi_mac="$(cat /sys/class/ieee80211/phy0/macaddress)"
-#Strip the : and increment mac by 1 to get wifi1 macaddress
-mac=$(echo $wifi_mac | tr -d ':')
-mac_incr=$((0x$mac + 8))
-wifi0_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-#Increment again by 1 to get wifi2 address
-mac_incr=$(($mac_incr + 1))
-wifi0_1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-#Increment again by 1 to get wifi2 address
-mac_incr=$(($mac_incr + 1))
-wifi1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-mac_incr=$(($mac_incr + 1))
-wifi1_1_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-mac_incr=$(($mac_incr + 1))
-wifi2_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
-#print the mac address
-echo $wifi0_mac
-echo $wifi1_mac
-echo $wifi2_mac
+#Obtain the wifi mac address
+wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
+wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
+wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
+wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2`
+wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
 
 #Update the mac address using ip link command
 ifconfig wifi0 down
@@ -40,6 +26,7 @@ ip link set dev wifi1 address $wifi1_mac
 ip link set dev wifi1.1 address $wifi1_1_mac
 ip link set dev wifi2 address $wifi2_mac
 ifconfig wifi0 up
+ifconfig wifi0.1 up
 ifconfig wifi1 up
 ifconfig wifi1.1 up
 ifconfig wifi2 up

meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-ap-extender.bbappend

@@ -12,5 +12,7 @@ RDEPENDS_packagegroup-ap-extender = "\
     ccsp-psm-ccsp \
     unified-wifi-mesh \
     ieee1905-em \
+    bpi-macaddress \
+    bpi-serialnumber \
 "
 DEPENDS += " ccsp-common-library"

meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb

@@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 
 inherit autotools ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)}  systemd
 
-SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;nobranch=1"
+SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;branch=develop"
 
 S = "${WORKDIR}/git"
 PV = "1.0.0"
-SRCREV = "10bae35768d234e969723aa51e9016f116f0870e"
+SRCREV = "d7510271e6860402dd6ecc30e50ebe530d7969bf"
 
 CXXFLAGS_append = "  -DAARCH64_BUILD"
+CXXFLAGS_append = "  ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', bb.utils.contains('DISTRO_FEATURES', 'em_extender', ' -D_EM_EXT_BUILD_ -D_EM_BUILD_ ',' -D_EM_BUILD_ ', d), ' ', d)}"
 
 
 do_compile() {

meta-rdk-mtk-bpir4/recipes-extended/serialnumber/bpi-serialnumber.bb

@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 
 inherit autotools ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)}  systemd
 
-SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;nobranch=1"
+SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;branch=develop"
 
 S = "${WORKDIR}/git"
 PV = "1.0.0"
-SRCREV = "10bae35768d234e969723aa51e9016f116f0870e"
+SRCREV = "d7510271e6860402dd6ecc30e50ebe530d7969bf"
 
 CFLAGS_append += " -DAARCH64_BUILD"