diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-10 15:47:03 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-11 07:48:08 +0000 |
| commit | b1199346643624733d249f39e7c359d9b4c89fdf (patch) | |
| tree | f9adef5640485da86ad854558e4348a6974aedfd /recipes | |
| parent | 580a6b9c91df699d3d131ae93d54449f96dbe122 (diff) | |
| download | meta-boot2qt-b1199346643624733d249f39e7c359d9b4c89fdf.tar.gz | |
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>
Diffstat (limited to 'recipes')
| -rwxr-xr-x | recipes/busybox/busybox/busybox-ifplugd.sh | 32 | ||||
| -rwxr-xr-x | recipes/busybox/busybox/ifplugd.action | 6 | ||||
| -rw-r--r-- | recipes/busybox/busybox/network.cfg | 1 | ||||
| -rw-r--r-- | recipes/busybox/busybox_1.%.bbappend | 46 | ||||
| -rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 | ||||
| -rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 |
6 files changed, 2 insertions, 85 deletions
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 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | DAEMON=/usr/sbin/ifplugd | ||
| 3 | NAME=ifplugd | ||
| 4 | DESC="Busybox IFPLUG Server" | ||
| 5 | ARGS="-i eth0" | ||
| 6 | |||
| 7 | test -f $DAEMON || exit 1 | ||
| 8 | |||
| 9 | set -e | ||
| 10 | |||
| 11 | case "$1" in | ||
| 12 | start) | ||
| 13 | echo -n "starting $DESC: $NAME... " | ||
| 14 | /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS | ||
| 15 | echo "done." | ||
| 16 | ;; | ||
| 17 | stop) | ||
| 18 | echo -n "stopping $DESC: $NAME... " | ||
| 19 | /sbin/start-stop-daemon -K -n $NAME | ||
| 20 | echo "done." | ||
| 21 | ;; | ||
| 22 | restart) | ||
| 23 | echo "restarting $DESC: $NAME... " | ||
| 24 | $0 stop | ||
| 25 | $0 start | ||
| 26 | echo "done." | ||
| 27 | ;; | ||
| 28 | *) | ||
| 29 | echo "Usage: $0 {start|stop|restart}" | ||
| 30 | exit 1 | ||
| 31 | ;; | ||
| 32 | 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 @@ | |||
| 1 | #/bin/sh | ||
| 2 | if [ "${2}" == "up" ]; then | ||
| 3 | ifup ${1} | ||
| 4 | else | ||
| 5 | ifdown ${1} | ||
| 6 | 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 @@ | |||
| 1 | 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 @@ | |||
| 1 | ############################################################################# | ||
| 2 | ## | ||
| 3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
| 4 | ## | ||
| 5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
| 6 | ## framework. | ||
| 7 | ## | ||
| 8 | ## $QT_BEGIN_LICENSE$ | ||
| 9 | ## Commercial License Usage Only | ||
| 10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
| 11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
| 12 | ## may use this file in accordance with the terms contained in said license | ||
| 13 | ## agreement. | ||
| 14 | ## | ||
| 15 | ## For further information use the contact form at | ||
| 16 | ## http://www.qt.io/contact-us. | ||
| 17 | ## | ||
| 18 | ## | ||
| 19 | ## $QT_END_LICENSE$ | ||
| 20 | ## | ||
| 21 | ############################################################################# | ||
| 22 | |||
| 23 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 24 | SRC_URI += "\ | ||
| 25 | file://network.cfg \ | ||
| 26 | file://busybox-ifplugd.sh \ | ||
| 27 | file://ifplugd.action \ | ||
| 28 | " | ||
| 29 | |||
| 30 | PACKAGES =+ "${PN}-ifplugd" | ||
| 31 | FILES_${PN}-ifplugd = "\ | ||
| 32 | ${sysconfdir}/init.d/busybox-ifplugd.sh \ | ||
| 33 | ${sysconfdir}/etc/ifplugd/ifplugd.action \ | ||
| 34 | " | ||
| 35 | |||
| 36 | INITSCRIPT_PACKAGES += "${PN}-ifplugd" | ||
| 37 | INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" | ||
| 38 | |||
| 39 | RRECOMMENDS_${PN} += "${PN}-ifplugd" | ||
| 40 | |||
| 41 | do_install_append () { | ||
| 42 | install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ | ||
| 43 | |||
| 44 | install -d ${D}${sysconfdir}/ifplugd | ||
| 45 | install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ | ||
| 46 | } | ||
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} = "\ | |||
| 62 | libevent \ | 62 | libevent \ |
| 63 | ostree \ | 63 | ostree \ |
| 64 | dracut \ | 64 | dracut \ |
| 65 | connman \ | ||
| 65 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ | 66 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ |
| 66 | ${MACHINE_EXTRA_INSTALL} \ | 67 | ${MACHINE_EXTRA_INSTALL} \ |
| 67 | " | 68 | " |
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} = "\ | |||
| 34 | perf \ | 34 | perf \ |
| 35 | htop \ | 35 | htop \ |
| 36 | ntp \ | 36 | ntp \ |
| 37 | connman-client \ | ||
| 37 | " | 38 | " |
