From 7c3befb14c4690f33495b9bb7b548e251fb82132 Mon Sep 17 00:00:00 2001
From: Patrick Zysset <patrick.zysset@netmodule.com>
Date: Mon, 31 Jan 2022 03:17:08 +0100
Subject: [PATCH] mac-address-set: use own services for bt and wlan settings

settin mac address of bt and wlan is now triggered in two separated
services.

BugzID: 77171

Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>
---
 .../mac-address-set/files/bt-address-set.service    | 13 +++++++++++++
 ...address-set.service => wlan-address-set.service} |  3 +--
 recipes-bsp/mac-address-set/mac-address-set.bb      |  8 +++++---
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 recipes-bsp/mac-address-set/files/bt-address-set.service
 rename recipes-bsp/mac-address-set/files/{mac-address-set.service => wlan-address-set.service} (66%)

diff --git a/recipes-bsp/mac-address-set/files/bt-address-set.service b/recipes-bsp/mac-address-set/files/bt-address-set.service
new file mode 100644
index 0000000..5ef9ddd
--- /dev/null
+++ b/recipes-bsp/mac-address-set/files/bt-address-set.service
@@ -0,0 +1,13 @@
+[Unit]
+After=tibluetooth.service
+After=jody-w1-bt-init.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/mac-address-set -b -l 1
+
+[Install]
+WantedBy=multi-user.target
+
+
diff --git a/recipes-bsp/mac-address-set/files/mac-address-set.service b/recipes-bsp/mac-address-set/files/wlan-address-set.service
similarity index 66%
rename from recipes-bsp/mac-address-set/files/mac-address-set.service
rename to recipes-bsp/mac-address-set/files/wlan-address-set.service
index 3fd74da..cbabd13 100644
--- a/recipes-bsp/mac-address-set/files/mac-address-set.service
+++ b/recipes-bsp/mac-address-set/files/wlan-address-set.service
@@ -1,11 +1,10 @@
 [Unit]
-After=tibluetooth.service
 Before=NetworkManager.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/mac-address-set
+ExecStart=/usr/bin/mac-address-set -w -l 1
 
 [Install]
 WantedBy=multi-user.target
diff --git a/recipes-bsp/mac-address-set/mac-address-set.bb b/recipes-bsp/mac-address-set/mac-address-set.bb
index 66327be..c853ded 100644
--- a/recipes-bsp/mac-address-set/mac-address-set.bb
+++ b/recipes-bsp/mac-address-set/mac-address-set.bb
@@ -9,7 +9,8 @@ PR = "r2"
 inherit systemd
 
 SRC_URI =  " \
-    file://mac-address-set.service \
+    file://wlan-address-set.service \
+    file://bt-address-set.service \
     file://mac-address-set.sh \
     "
 
@@ -17,7 +18,7 @@ S = "${WORKDIR}"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-SYSTEMD_SERVICE_${PN} = "mac-address-set.service"
+SYSTEMD_SERVICE_${PN} = "wlan-address-set.service bt-address-set.service"
 SYSTEMD_AUTO_ENABLE ?= "enable"
 
 FILES_${PN}_append = " \
@@ -27,7 +28,8 @@ FILES_${PN}_append = " \
 
 do_install () {
     install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 mac-address-set.service ${D}${systemd_unitdir}/system/
+    install -m 0644 wlan-address-set.service ${D}${systemd_unitdir}/system/
+    install -m 0644 bt-address-set.service ${D}${systemd_unitdir}/system/
 
     install -d ${D}/usr/bin
     install -m 0755 mac-address-set.sh ${D}/usr/bin/mac-address-set