diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-connectivity/connman | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman')
9 files changed, 163 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome_git.bb b/meta/recipes-connectivity/connman/connman-gnome_git.bb new file mode 100644 index 0000000000..440ba285cc --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome_git.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | |||
2 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git" | ||
3 | DEPENDS = "gtk+" | ||
4 | PV = "0.1+git${SRCPV}" | ||
5 | PR = "r0" | ||
6 | |||
7 | S = "${WORKDIR}/git" | ||
8 | |||
9 | inherit autotools | ||
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc new file mode 100644 index 0000000000..9a623d7f4e --- /dev/null +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -0,0 +1,43 @@ | |||
1 | HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" | ||
2 | SUMMARY = "Moblin Connection Manager" | ||
3 | LICENSE = "GPL" | ||
4 | |||
5 | DEPENDS = "libgdbus dbus glib-2.0 hal" | ||
6 | RDEPENDS_${PN} = "dhcp-client wpa-supplicant resolvconf" | ||
7 | |||
8 | EXTRA_OECONF += " \ | ||
9 | --enable-ethernet=builtin --enable-wifi=builtin --enable-dhclient=builtin \ | ||
10 | --enable-bluetooth=builtin --enable-udev --enable-loopback=builtin \ | ||
11 | --enable-dnsproxy=builtin --enable-threads --enable-resolvconf=builtin \ | ||
12 | --enable-client --enable-fake --with-dhclient=/sbin/dhclient \ | ||
13 | --enable-test \ | ||
14 | ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant" | ||
15 | |||
16 | INITSCRIPT_NAME = "connman" | ||
17 | INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ." | ||
18 | |||
19 | inherit autotools pkgconfig update-rc.d | ||
20 | |||
21 | do_install_append() { | ||
22 | install -d ${D}${sysconfdir}/init.d/ | ||
23 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | ||
24 | } | ||
25 | |||
26 | PACKAGES_DYNAMIC = "${PN}-plugin-*" | ||
27 | FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ | ||
28 | ${sysconfdir} ${sharedstatedir} ${localstatedir} \ | ||
29 | ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ | ||
30 | ${datadir}/pixmaps ${datadir}/applications \ | ||
31 | ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ | ||
32 | ${libdir}/bonobo/servers \ | ||
33 | ${libdir}/${PN}/test/* \ | ||
34 | ${datadir}/dbus-1/system-services/* \ | ||
35 | ${libdir}/connman/scripts/dhclient*" | ||
36 | FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ | ||
37 | ${libdir}/connman/scripts/.debug" | ||
38 | |||
39 | python populate_packages_prepend() { | ||
40 | plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) | ||
41 | plugin_name = bb.data.expand('${PN}-plugin-%s', d) | ||
42 | do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) | ||
43 | } \ No newline at end of file | ||
diff --git a/meta/recipes-connectivity/connman/connman_0.48.bb b/meta/recipes-connectivity/connman/connman_0.48.bb new file mode 100644 index 0000000000..269f987215 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_0.48.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require connman.inc | ||
2 | PR = "r0" | ||
3 | |||
4 | SRC_URI = "http://www.kernel.org/pub/linux/network/connman/${P}.tar.bz2 \ | ||
5 | file://dbusperms.patch \ | ||
6 | file://connman " | ||
7 | |||
diff --git a/meta/recipes-connectivity/connman/connman_git.bb b/meta/recipes-connectivity/connman/connman_git.bb new file mode 100644 index 0000000000..82cd976e55 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_git.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require connman.inc | ||
2 | |||
3 | PV = "0.47+git${SRCPV}" | ||
4 | PR = "r17" | ||
5 | S = "${WORKDIR}/git" | ||
6 | |||
7 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ | ||
8 | file://dbusperms.patch \ | ||
9 | file://connman " | ||
10 | |||
diff --git a/meta/recipes-connectivity/connman/files/connman b/meta/recipes-connectivity/connman/files/connman new file mode 100755 index 0000000000..f8154f68f9 --- /dev/null +++ b/meta/recipes-connectivity/connman/files/connman | |||
@@ -0,0 +1,42 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | DAEMON=/usr/sbin/connmand | ||
4 | PIDFILE=/var/run/connmand.pid | ||
5 | DESC="Connection Manager" | ||
6 | |||
7 | if [ -f /etc/default/connman ] ; then | ||
8 | . /etc/default/connman | ||
9 | fi | ||
10 | |||
11 | set -e | ||
12 | |||
13 | do_start() { | ||
14 | $DAEMON | ||
15 | } | ||
16 | |||
17 | do_stop() { | ||
18 | start-stop-daemon --stop --name connmand --quiet | ||
19 | } | ||
20 | |||
21 | case "$1" in | ||
22 | start) | ||
23 | echo "Starting $DESC" | ||
24 | do_start | ||
25 | ;; | ||
26 | stop) | ||
27 | echo "Stopping $DESC" | ||
28 | do_stop | ||
29 | ;; | ||
30 | restart|force-reload) | ||
31 | echo "Restarting $DESC" | ||
32 | do_stop | ||
33 | sleep 1 | ||
34 | do_start | ||
35 | ;; | ||
36 | *) | ||
37 | echo "Usage: $0 {start|stop|restart|force-reload}" >&2 | ||
38 | exit 1 | ||
39 | ;; | ||
40 | esac | ||
41 | |||
42 | exit 0 | ||
diff --git a/meta/recipes-connectivity/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch b/meta/recipes-connectivity/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch new file mode 100644 index 0000000000..57df7196ec --- /dev/null +++ b/meta/recipes-connectivity/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: git/test/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/test/Makefile.am 2009-05-21 12:07:39.000000000 +0100 | ||
4 | +++ git/test/Makefile.am 2009-05-21 17:29:33.000000000 +0100 | ||
5 | @@ -1,5 +1,7 @@ | ||
6 | |||
7 | -EXTRA_DIST = get-state list-profiles list-services \ | ||
8 | +testdir = $(pkgdatadir)/tests | ||
9 | + | ||
10 | +test_SCRIPTS = get-state list-profiles list-services \ | ||
11 | list-connections select-connection \ | ||
12 | list-devices enable-device disable-device start-scanning \ | ||
13 | list-networks select-network disable-network create-network \ | ||
diff --git a/meta/recipes-connectivity/connman/files/connman-install-tests.patch b/meta/recipes-connectivity/connman/files/connman-install-tests.patch new file mode 100644 index 0000000000..0ea3758f2d --- /dev/null +++ b/meta/recipes-connectivity/connman/files/connman-install-tests.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: git/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/Makefile.am 2009-08-24 15:56:33.000000000 +0100 | ||
4 | +++ git/Makefile.am 2009-08-24 16:02:38.000000000 +0100 | ||
5 | @@ -115,7 +115,9 @@ | ||
6 | tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@ | ||
7 | endif | ||
8 | |||
9 | -EXTRA_DIST += test/get-state test/list-profiles test/list-services \ | ||
10 | +testdir = $(pkgdatadir)/tests | ||
11 | + | ||
12 | +test_SCRIPTS = test/get-state test/list-profiles test/list-services \ | ||
13 | test/connect-service test/list-connections \ | ||
14 | test/select-connection test/list-devices test/enable-device \ | ||
15 | test/disable-device test/start-scanning test/list-networks \ | ||
diff --git a/meta/recipes-connectivity/connman/files/dbusperms.patch b/meta/recipes-connectivity/connman/files/dbusperms.patch new file mode 100644 index 0000000000..100af0367b --- /dev/null +++ b/meta/recipes-connectivity/connman/files/dbusperms.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: git/src/connman-dbus.conf | ||
2 | =================================================================== | ||
3 | --- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100 | ||
4 | +++ git/src/connman-dbus.conf 2009-05-26 00:34:48.000000000 +0100 | ||
5 | @@ -10,6 +10,6 @@ | ||
6 | <allow send_destination="org.moblin.connman"/> | ||
7 | </policy> | ||
8 | <policy context="default"> | ||
9 | - <deny send_destination="org.moblin.connman"/> | ||
10 | + <allow send_destination="org.moblin.connman"/> | ||
11 | </policy> | ||
12 | </busconfig> | ||
diff --git a/meta/recipes-connectivity/connman/files/udevfix.patch b/meta/recipes-connectivity/connman/files/udevfix.patch new file mode 100644 index 0000000000..803bec5281 --- /dev/null +++ b/meta/recipes-connectivity/connman/files/udevfix.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: git/src/connman.rules | ||
2 | =================================================================== | ||
3 | --- git.orig/src/connman.rules 2009-05-25 14:24:53.000000000 +0100 | ||
4 | +++ git/src/connman.rules 2009-05-25 14:25:16.000000000 +0100 | ||
5 | @@ -3,6 +3,7 @@ | ||
6 | |||
7 | SUBSYSTEM=="net", KERNEL=="eth*", ENV{CONNMAN_TYPE}="ethernet" | ||
8 | SUBSYSTEM=="net", KERNEL=="wlan*", ENV{CONNMAN_TYPE}="wifi" | ||
9 | +SUBSYSTEM=="net", KERNEL=="ra0", ENV{CONNMAN_TYPE}="wifi" | ||
10 | |||
11 | SUBSYSTEM=="net", DRIVERS=="hso", ENV{CONNMAN_TYPE}="hso" | ||
12 | |||