From 016240df2cea0b8cd91f865b85cb533c435566e9 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Thu, 21 Sep 2017 10:32:33 +0300
Subject: qdb: Update to 1.2.0 and remove gadget init/deinit from init script

It's not possible to deterministically control timings of gadget initialization
from an external script. Gadget initialization and deinitialization logic from
/usr/bin/qdbd-init.sh was moved inside qdbd in QDB 1.2.0.

Task-number: QTBUG-63029
Done-with: Kari Oikarinen <kari.oikarinen@qt.io>
Change-Id: Ia5d5ab3162032b6609c85d91bdce7b70c72469b9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
---
 .../recipes-qt/boot2qt-addons/qdb/qdbd-init.sh        | 19 -------------------
 meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb     |  4 ++--
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
index 15981b0..15e048f 100755
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
@@ -46,19 +46,6 @@ GADGET_CONFIG=$CONFIGFS_PATH/usb_gadget/g1
 
 . /etc/default/qdbd
 
-initialize_gadget() {
-    # Initialize gadget with first UDC driver
-    for driverpath in /sys/class/udc/*; do
-        drivername=`basename $driverpath`
-        echo "$drivername" > $GADGET_CONFIG/UDC
-        break
-    done
-}
-
-disable_gadget() {
-    echo "" > $GADGET_CONFIG/UDC
-}
-
 case "$1" in
 start)
     b2qt-gadget-network.sh --reset
@@ -86,11 +73,8 @@ start)
     mount -t functionfs qdb /dev/usb-ffs/qdb -o uid=0,gid=0
     shift
     start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
-    sleep 1
-    initialize_gadget
     ;;
 stop)
-    disable_gadget
     start-stop-daemon --stop --quiet --exec $DAEMON
     sleep 1
     umount /dev/usb-ffs/qdb
@@ -104,14 +88,11 @@ stop)
     rmdir $GADGET_CONFIG
     ;;
 restart)
-    disable_gadget
     start-stop-daemon --stop --quiet --exec $DAEMON
     b2qt-gadget-network.sh --reset
     sleep 1
     shift
     start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
-    sleep 1
-    initialize_gadget
     ;;
 *)
     echo "Usage: $0 {start|stop|restart}"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
index 5eebaea..ceeb17e 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
@@ -45,8 +45,8 @@ SRC_URI += "file://b2qt-gadget-network.sh \
            file://qdbd-init.sh \
           "
 
-SRCREV = "69f95b6a8d2ca0912a8d502a2b6871109725731e"
-PV = "1.1.0+git${SRCPV}"
+SRCREV = "59ea3a9ed6c10248ecdfb7cf111c3b7d1f70cba6"
+PV = "1.2.0+git${SRCPV}"
 
 REQUIRED_DISTRO_FEATURES = "systemd"
 DEPENDS = "qtbase"
-- 
cgit v1.2.3-54-g00ecf