From 8c3a88809f88524f997f1422d66676878011f3be Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Fri, 7 Jul 2017 10:25:10 +0300
Subject: Fix qdb connection

Connman has gadget networks disabled by default. Service qdbd creates
usb0 gadget connection. This results in race condition where usb0
disappears if connman is started late enough after qdbd. Fix is to
enable gadget networks for connman so it doesn't force it off.

Task-number: QTBUG-61718
Change-Id: I896b537bcfb03a1b92960166f0579a58ba6a2d6f
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
---
 recipes/connman-conf/connman-conf.bbappend | 42 ++++++++++++++++++++++++++++++
 recipes/connman-conf/connman-conf/settings |  5 ++++
 2 files changed, 47 insertions(+)
 create mode 100644 recipes/connman-conf/connman-conf.bbappend
 create mode 100644 recipes/connman-conf/connman-conf/settings

diff --git a/recipes/connman-conf/connman-conf.bbappend b/recipes/connman-conf/connman-conf.bbappend
new file mode 100644
index 0000000..06dc61d
--- /dev/null
+++ b/recipes/connman-conf/connman-conf.bbappend
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+CONNMAN_SETTINGS_DIR := "${localstatedir}/lib/connman"
+
+FILES_${PN} += "${CONNMAN_SETTINGS_DIR}/settings"
+
+SRC_URI += "file://settings \
+          "
+
+do_install_append() {
+    install -d ${D}/${CONNMAN_SETTINGS_DIR}
+    install -m 0644 ${WORKDIR}/settings ${D}/${CONNMAN_SETTINGS_DIR}/settings
+}
diff --git a/recipes/connman-conf/connman-conf/settings b/recipes/connman-conf/connman-conf/settings
new file mode 100644
index 0000000..edfedd4
--- /dev/null
+++ b/recipes/connman-conf/connman-conf/settings
@@ -0,0 +1,5 @@
+[global]
+OfflineMode=false
+
+[Gadget]
+Enable=true
-- 
cgit v1.2.3-54-g00ecf