Merge pull request #157 from rdkcentral/rdkaccl-292-macaddress

RDKBACCL-653,RDKBACCL-660 :  Serial number and randomized mac address

Author: cpokuru

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

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

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend

@@ -3,6 +3,8 @@ IMAGE_INSTALL_append = " parodus parodus2ccsp"
 
 #TR069 Feature
 IMAGE_INSTALL_append = " ccsp-tr069-pa"
+IMAGE_INSTALL_append = " bpi-serialnumber"
+IMAGE_INSTALL_append = " bpi-macaddress"
 
 ROOTFS_POSTPROCESS_COMMAND_append = "add_busybox_fixes; "
 

meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend

@@ -5,6 +5,17 @@ do_install_append(){
 sed -i '/model/a \
 if [ ! -d /nvram/secure ]; then \
     mkdir -p /nvram/secure \
+fi \
+rdkmmap \
+rdkb-bpi-mac \
+if [ $? -eq 0 ];then \
+    for i in 0 1 2 3 \
+    do \
+        LAN_MAC=`cat /nvram/mac_addresses.txt | grep -a lan${i} | cut -d " " -f 2` \
+        if [ "x$LAN_MAC" != "x" ]; then \
+                ifconfig lan${i} hw ether $LAN_MAC \
+        fi \
+   done \
 fi' ${D}${sbindir}/init-bridge.sh
 }
 

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

@@ -0,0 +1,22 @@
+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
+
+SRC_URI = "git://github.com/rdkcentral/broadband-utils.git;branch=main;protocol=https;"
+
+S = "${WORKDIR}/git"
+SRCREV = "${AUTOREV}"
+CXXFLAGS_append = "  -DAARCH64_BUILD"
+
+
+do_compile() {
+	${CXX} ${S}/rdkb-bpi-mac/source/*.cpp ${LDFLAGS} ${CXXFLAGS} -I ${S}/rdkb-bpi-mac//include -o rdkb-bpi-mac
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 rdkb-bpi-mac ${D}${bindir}/rdkb-bpi-mac
+}

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

@@ -0,0 +1,28 @@
+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
+
+SRC_URI = "git://github.com/rdkcentral/broadband-utils.git;branch=main;protocol=https;"
+
+S = "${WORKDIR}/git"
+SRCREV = "${AUTOREV}"
+
+CFLAGS_append += " -DAARCH64_BUILD"
+
+do_compile() {
+	${CC} ${S}/rdkmmap/source/*.c ${LDFLAGS} ${CFLAGS} -I ${S}/rdkmmap/include -o rdkmmap
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 rdkmmap ${D}${bindir}/rdkmmap
+#	install -D -m 0644 ${S}/rdkmmap/rdkmmap.service ${D}${systemd_unitdir}/system/rdkmmap.service
+}
+
+#SYSTEMD_SERVICE_${PN} += " rdkmmap.service"
+
+#FILES_${PN}_append = "${systemd_unitdir}/system/rdkmmap.service"
+