connman: Use connman as default network management tool

Upgrade connman to version 0.56
Modify connman-gnome to match the recent version of connman
Deprecate networkmanager

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
This commit is contained in:
Dongxiao Xu 2010-08-26 13:37:52 +08:00 committed by Richard Purdie
parent f6917ad47b
commit ca4a58a4eb
15 changed files with 3684 additions and 74 deletions

View File

@ -15,7 +15,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
NETWORK_MANAGER ?= "networkmanager-applet"
NETWORK_MANAGER ?= "connman-gnome"
RDEPENDS_task-poky-x11-netbook = "\
mutter \
matchbox-desktop \

View File

@ -9,6 +9,7 @@ AUTHOR = "Thomas Hood"
HOMEPAGE = "http://packages.debian.org/resolvconf"
DEPENDS = "bash"
RDEPENDS = "bash"
PR = "r1"
SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
@ -17,7 +18,7 @@ do_compile () {
}
do_install () {
install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface
install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface
install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
cp -pPR etc/* ${D}${sysconfdir}/
install -m 0755 bin/resolvconf ${D}${base_sbindir}/

View File

@ -0,0 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Name=Connection Manager
Comment=Connection Manager applet
Icon=stock_internet
Exec=connman-applet
Terminal=false
Type=Application
Categories=Network;GTK;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,22 @@
DESCRIPTION = "gtk frontend for connman"
HOMEPAGE = "http://connman.net/"
SECTION = "libs/network"
LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
DEPENDS = "gtk+ dbus"
PR = "r0"
RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"
SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
file://connman-gnome.patch \
file://connman-applet.desktop"
inherit autotools gtk-icon-cache
do_install_append() {
install -d ${D}${datadir}/applications/
install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
}

View File

@ -1,9 +0,0 @@
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git"
DEPENDS = "gtk+"
PV = "0.1+git${SRCPV}"
PR = "r0"
S = "${WORKDIR}/git"
inherit autotools

View File

@ -1,17 +1,13 @@
HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
SUMMARY = "Moblin Connection Manager"
LICENSE = "GPL"
DESCRIPTION = "The ConnMan project provides a daemon for managing \
internet connections within embedded devices running the Linux operating system"
HOMEPAGE = "http://connman.net/"
BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
DEPENDS = "libgdbus dbus glib-2.0 hal"
RDEPENDS_${PN} = "dhcp-client wpa-supplicant resolvconf"
EXTRA_OECONF += " \
--enable-ethernet=builtin --enable-wifi=builtin --enable-dhclient=builtin \
--enable-bluetooth=builtin --enable-udev --enable-loopback=builtin \
--enable-dnsproxy=builtin --enable-threads --enable-resolvconf=builtin \
--enable-client --enable-fake --with-dhclient=/sbin/dhclient \
--enable-test \
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant"
RDEPENDS_${PN} = "wpa-supplicant resolvconf"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ."
@ -39,5 +35,5 @@ FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
python populate_packages_prepend() {
plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
plugin_name = bb.data.expand('${PN}-plugin-%s', d)
do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
}
do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
}

View File

@ -1,7 +0,0 @@
require connman.inc
PR = "r0"
SRC_URI = "http://www.kernel.org/pub/linux/network/connman/${P}.tar.bz2 \
file://dbusperms.patch \
file://connman "

View File

@ -0,0 +1,25 @@
require connman.inc
PR = "r0"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--disable-gtk-doc \
--enable-debug \
--enable-threads \
--enable-loopback \
--enable-ethernet \
--enable-wifi \
--enable-bluetooth \
--enable-dnsproxy \
--disable-dhclient \
--enable-test \
--disable-udev \
--disable-polkit \
--enable-client \
--enable-fake \
--prefix=/usr --sysconfdir=/etc --localstatedir=/var"
SRC_URI = "\
http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
file://connman \
"

View File

@ -1,13 +0,0 @@
Index: git/test/Makefile.am
===================================================================
--- git.orig/test/Makefile.am 2009-05-21 12:07:39.000000000 +0100
+++ git/test/Makefile.am 2009-05-21 17:29:33.000000000 +0100
@@ -1,5 +1,7 @@
-EXTRA_DIST = get-state list-profiles list-services \
+testdir = $(pkgdatadir)/tests
+
+test_SCRIPTS = get-state list-profiles list-services \
list-connections select-connection \
list-devices enable-device disable-device start-scanning \
list-networks select-network disable-network create-network \

View File

@ -1,15 +0,0 @@
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am 2009-08-24 15:56:33.000000000 +0100
+++ git/Makefile.am 2009-08-24 16:02:38.000000000 +0100
@@ -115,7 +115,9 @@
tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
endif
-EXTRA_DIST += test/get-state test/list-profiles test/list-services \
+testdir = $(pkgdatadir)/tests
+
+test_SCRIPTS = test/get-state test/list-profiles test/list-services \
test/connect-service test/list-connections \
test/select-connection test/list-devices test/enable-device \
test/disable-device test/start-scanning test/list-networks \

View File

@ -1,12 +0,0 @@
Index: git/src/connman.rules
===================================================================
--- git.orig/src/connman.rules 2009-05-25 14:24:53.000000000 +0100
+++ git/src/connman.rules 2009-05-25 14:25:16.000000000 +0100
@@ -3,6 +3,7 @@
SUBSYSTEM=="net", KERNEL=="eth*", ENV{CONNMAN_TYPE}="ethernet"
SUBSYSTEM=="net", KERNEL=="wlan*", ENV{CONNMAN_TYPE}="wifi"
+SUBSYSTEM=="net", KERNEL=="ra0", ENV{CONNMAN_TYPE}="wifi"
SUBSYSTEM=="net", DRIVERS=="hso", ENV{CONNMAN_TYPE}="hso"

View File

@ -4,7 +4,7 @@
DESCRIPTION = "Sato Tasks for Poky"
LICENSE = "MIT"
PR = "r29"
PR = "r30"
PACKAGES = "\
task-poky-x11-sato \
@ -16,7 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
NETWORK_MANAGER ?= "networkmanager-applet"
NETWORK_MANAGER ?= "connman-gnome"
RDEPENDS_task-poky-x11-sato = "\
matchbox-desktop \
matchbox-session-sato \