From b1199346643624733d249f39e7c359d9b4c89fdf Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Tue, 10 Nov 2015 15:47:03 +0200
Subject: Use connman for managing network connections

Connman replaces busybox-ifplugd for handling wired connections.
Wpa-supplicant is still needed for wifi connections in B2Qt Wifi Module.

Change-Id: I0ddaee26f19915b35fb057cfac5553786f3ef5df
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 recipes/busybox/busybox/busybox-ifplugd.sh         | 32 ---------------
 recipes/busybox/busybox/ifplugd.action             |  6 ---
 recipes/busybox/busybox/network.cfg                |  1 -
 recipes/busybox/busybox_1.%.bbappend               | 46 ----------------------
 .../packagegroup-b2qt-embedded-base.bb             |  1 +
 .../packagegroup-b2qt-embedded-tools.bb            |  1 +
 6 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100755 recipes/busybox/busybox/busybox-ifplugd.sh
 delete mode 100755 recipes/busybox/busybox/ifplugd.action
 delete mode 100644 recipes/busybox/busybox/network.cfg
 delete mode 100644 recipes/busybox/busybox_1.%.bbappend

diff --git a/recipes/busybox/busybox/busybox-ifplugd.sh b/recipes/busybox/busybox/busybox-ifplugd.sh
deleted file mode 100755
index 9ea40a8..0000000
--- a/recipes/busybox/busybox/busybox-ifplugd.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/ifplugd
-NAME=ifplugd
-DESC="Busybox IFPLUG Server"
-ARGS="-i eth0"
-
-test -f $DAEMON || exit 1
-
-set -e
-
-case "$1" in
-	start)
-		echo -n "starting $DESC: $NAME... "
-		/sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
-		echo "done."
-	;;
-	stop)
-		echo -n "stopping $DESC: $NAME... "
-		/sbin/start-stop-daemon -K -n $NAME
-		echo "done."
-	;;
-	restart)
-		echo "restarting $DESC: $NAME... "
-		$0 stop
-		$0 start
-		echo "done."
-	;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-	;;
-esac
diff --git a/recipes/busybox/busybox/ifplugd.action b/recipes/busybox/busybox/ifplugd.action
deleted file mode 100755
index 44fe040..0000000
--- a/recipes/busybox/busybox/ifplugd.action
+++ /dev/null
@@ -1,6 +0,0 @@
-#/bin/sh
-if [ "${2}" == "up" ]; then
-    ifup ${1}
-else
-    ifdown ${1}
-fi
diff --git a/recipes/busybox/busybox/network.cfg b/recipes/busybox/busybox/network.cfg
deleted file mode 100644
index f858907..0000000
--- a/recipes/busybox/busybox/network.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IFPLUGD=y
diff --git a/recipes/busybox/busybox_1.%.bbappend b/recipes/busybox/busybox_1.%.bbappend
deleted file mode 100644
index 7a519c6..0000000
--- a/recipes/busybox/busybox_1.%.bbappend
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://network.cfg \
-    file://busybox-ifplugd.sh \
-    file://ifplugd.action \
-    "
-
-PACKAGES =+ "${PN}-ifplugd"
-FILES_${PN}-ifplugd = "\
-    ${sysconfdir}/init.d/busybox-ifplugd.sh \
-    ${sysconfdir}/etc/ifplugd/ifplugd.action \
-    "
-
-INITSCRIPT_PACKAGES += "${PN}-ifplugd"
-INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh"
-
-RRECOMMENDS_${PN} += "${PN}-ifplugd"
-
-do_install_append () {
-    install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/
-
-    install -d ${D}${sysconfdir}/ifplugd
-    install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/
-}
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index a2d9c72..b6b9d11 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -62,6 +62,7 @@ RDEPENDS_${PN} = "\
         libevent \
         ostree \
         dracut \
+        connman \
         ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
         ${MACHINE_EXTRA_INSTALL} \
         "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 351a752..de36975 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -34,4 +34,5 @@ RDEPENDS_${PN} = "\
         perf \
         htop \
         ntp \
+        connman-client \
         "
-- 
cgit v1.2.3-54-g00ecf