qdb: fix qdb daemon startup problems

- Kernel needs some time before usb_gadget properly loaded and configured.
- use basic.target for qdbd, since not all devices have wired network.
- use /etc/machine-id for the serial, since not all devices have wired network.

Task-number: QTBUG-60774
Change-Id: I84edb1757868611d1562571656e41ea6dbe632f0
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

3 files changed, 3 insertions, 2 deletions

diff --git a/recipes-qt/b2qt-addons/qdbd/defaults b/recipes-qt/b2qt-addons/qdbd/defaults
index edefcd2..64478b9 100644
--- a/recipes-qt/b2qt-addons/qdbd/defaults
+++ b/recipes-qt/b2qt-addons/qdbd/defaults
@@ -1,3 +1,3 @@
 VENDOR=0xdbdb
 PRODUCT=0x0001
-SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+SERIAL=$(hostname)-$(cat /etc/machine-id)
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
index 10151c9..bcc22a8 100755
--- a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
+++ b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
@@ -63,6 +63,7 @@ case "$1" in
 start)
     b2qt-gadget-network.sh --reset
     modprobe libcomposite
+    sleep 1
     # Gadget configuration
     mkdir -p $GADGET_CONFIG
     echo $VENDOR > $GADGET_CONFIG/idVendor
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd.service b/recipes-qt/b2qt-addons/qdbd/qdbd.service
index 88806a2..6c1b8e8 100644
--- a/recipes-qt/b2qt-addons/qdbd/qdbd.service
+++ b/recipes-qt/b2qt-addons/qdbd/qdbd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Qt Debug Bridge Daemon
-After=network.target
+After=basic.target
 Before=adbd.service
 Conflicts=adbd.service