summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-08 18:30:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-09 17:46:34 +0000
commit1288313411f8db7628e9ec4c04f2ad7f830e994d (patch)
treeee02883e5c6dfde0d8447e40592aafb850a8b743
parent9ebdfb081fd9d95abc4302b77d4f9ea42e395f0e (diff)
downloadpoky-1288313411f8db7628e9ec4c04f2ad7f830e994d.tar.gz
connman: update to 0.78
Updates the package to 0.78 bringing changes done on meta-oe and extra cleanups as: * xtables_version.patch: removed as it has been merged upstream * use sed to fix dbus access policy * remove build depends on dhclient as connman has an internal client now * make wifi and bluetooth building optional * add ppp in depends that is used by some plugins * add ntp in depends and enable ntp plugin * package tools * enable fake plugin This uses PR as "r1" since it was previously available on meta-oe. (From OE-Core rev: 4215b2fb04b3ed61e8e1cf0847639cf6fe31d337) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-connectivity/connman/connman.inc96
-rw-r--r--meta/recipes-connectivity/connman/connman/xtables_version.patch64
-rw-r--r--meta/recipes-connectivity/connman/connman_0.75.bb29
-rw-r--r--meta/recipes-connectivity/connman/connman_0.78.bb10
4 files changed, 79 insertions, 120 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7ee460ec8b..e90aa4b02a 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,32 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" 14 file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
15 15
16DEPENDS = "libgdbus dbus glib-2.0 iptables" 16# we need to define the depends here, the dynamic stuff is too late
17DEPENDS = "dbus glib-2.0 ppp iptables gnutls ntp \
18 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
19 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
20 "
21
22EXTRA_OECONF += "\
23 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
24 ac_cv_path_PPPD=${sbindir}/pppd \
25 --disable-gtk-doc \
26 --enable-debug \
27 --enable-threads \
28 --enable-loopback \
29 --enable-ethernet \
30 ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
31 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
32 --enable-dnsproxy \
33 --enable-ofono \
34 --enable-tools \
35 --enable-test \
36 --disable-polkit \
37 --enable-client \
38 --enable-fake \
39 --enable-ntpd \
40 --with-ntpd=${bindir}/ntpd \
41"
17 42
18INITSCRIPT_NAME = "connman" 43INITSCRIPT_NAME = "connman"
19INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 44INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -25,44 +50,61 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
25 50
26inherit autotools pkgconfig update-rc.d useradd 51inherit autotools pkgconfig update-rc.d useradd
27 52
28do_install_append() { 53do_compile_append() {
29 install -d ${D}${sysconfdir}/init.d/ 54 sed -i -e s:deny:allow:g src/connman-dbus.conf
30 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
31} 55}
32 56
33PACKAGES += "${PN}-scripts" 57do_install_append() {
34RDEPENDS_${PN}-scripts += "python" 58 install -d ${D}${sysconfdir}/init.d
35 59 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
36PACKAGES_DYNAMIC = "${PN}-plugin-*"
37FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
38 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
39 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
40 ${datadir}/pixmaps ${datadir}/applications \
41 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
42 ${libdir}/bonobo/servers \
43 ${datadir}/dbus-1/system-services/* \
44 ${libdir}/connman/scripts/dhclient*"
45FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
46 ${libdir}/connman/scripts/.debug"
47 60
48FILES_${PN}-dev += "${libdir}/connman/plugins/*.la" 61 install -d ${D}${bindir}
62 install -m 0755 ${S}/tools/*-test ${D}${bindir}
63 install -m 0755 ${S}/tools/wispr ${D}${bindir}
64}
49 65
50FILES_${PN}-scripts += "${libdir}/${PN}/test/*" 66PACKAGES_DYNAMIC = "${PN}-plugin-*"
51 67
52python populate_packages_prepend() { 68python populate_packages_prepend() {
53 prefix = (d.getVar("MLPREFIX", True) or "") 69 depmap = dict( pppd="ppp",
54 depmap = dict( wifi=prefix+"wpa-supplicant", bluetooth=prefix+"bluez4", ofono=prefix+"ofono" ) 70 udhcp="busybox connman-scripts",
71 dhclient="dhcp-client",
72 wifi="wpa-supplicant",
73 resolvconf="resolvconf",
74 bluetooth="bluez4",
75 ntpd="ntp",
76 ofono="ofono" )
55 packages = [] 77 packages = []
78 multilib_prefix = (d.getVar("MLPREFIX", True) or "")
56 hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) 79 hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
57
58 plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) 80 plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
59 plugin_name = bb.data.expand('${PN}-plugin-%s', d) 81 plugin_name = bb.data.expand('${PN}-plugin-%s', d)
60
61 do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook ) 82 do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook )
62
63 for (file, package) in packages: 83 for (file, package) in packages:
64 plugintype = package.split( '-' )[-1] 84 plugintype = package.split( '-' )[-1]
65 if plugintype in depmap: 85 if plugintype in depmap:
66 bb.note( "Adding rdependency on %s to package %s" % ( depmap[plugintype], package ) ) 86 rdepends = map(lambda x: multilib_prefix + x, depmap[plugintype].split())
67 d.setVar("RDEPENDS_%s" % package, depmap[plugintype]) 87 bb.note( "Adding rdependency on %s to %s" % ( rdepends, package ) )
88 d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
68} 89}
90
91PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests"
92
93FILES_${PN}-tools = "${bindir}/wispr"
94
95FILES_${PN}-tests = "${bindir}/*-test"
96
97FILES_${PN}-scripts += "${libdir}/${PN}/test/* ${libdir}/connman/scripts"
98RDEPENDS_${PN}-scripts = "python"
99
100FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
101 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
102 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
103 ${datadir}/pixmaps ${datadir}/applications \
104 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
105 ${libdir}/bonobo/servers \
106 ${datadir}/dbus-1/system-services/*"
107
108FILES_${PN}-dbg += "${libdir}/connman/*/.debug"
109
110FILES_${PN}-dev += "${libdir}/connman/*/*.la"
diff --git a/meta/recipes-connectivity/connman/connman/xtables_version.patch b/meta/recipes-connectivity/connman/connman/xtables_version.patch
deleted file mode 100644
index 13e2c36aa8..0000000000
--- a/meta/recipes-connectivity/connman/connman/xtables_version.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1xtables_merge_options API change, fix its calling in connman.
2
3Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
4
5Upstream-Status: Backport
6
7diff -ruN connman-0.75-orig//src/iptables.c connman-0.75/src/iptables.c
8--- connman-0.75-orig//src/iptables.c 2011-02-22 12:16:25.000000000 +0800
9+++ connman-0.75/src/iptables.c 2011-10-26 09:21:33.941164000 +0800
10@@ -1089,7 +1089,11 @@
11 if (xt_t->init != NULL)
12 xt_t->init(xt_t->t);
13 iptables_globals.opts =
14- xtables_merge_options(iptables_globals.opts,
15+ xtables_merge_options(
16+#if XTABLES_VERSION_CODE > 5
17+ iptables_globals.orig_opts,
18+#endif
19+ iptables_globals.opts,
20 xt_t->extra_opts,
21 &xt_t->option_offset);
22 if (iptables_globals.opts == NULL)
23@@ -1113,7 +1117,11 @@
24 xt_m->init(xt_m->m);
25 if (xt_m != xt_m->next) {
26 iptables_globals.opts =
27- xtables_merge_options(iptables_globals.opts,
28+ xtables_merge_options(
29+#if XTABLES_VERSION_CODE > 5
30+ iptables_globals.orig_opts,
31+#endif
32+ iptables_globals.opts,
33 xt_m->extra_opts,
34 &xt_m->option_offset);
35 if (iptables_globals.opts == NULL)
36diff -ruN connman-0.75-orig//tools/iptables-test.c connman-0.75/tools/iptables-test.c
37--- connman-0.75-orig//tools/iptables-test.c 2011-02-22 12:16:25.000000000 +0800
38+++ connman-0.75/tools/iptables-test.c 2011-10-26 09:23:25.701164000 +0800
39@@ -1076,7 +1076,11 @@
40 if (xt_t->init != NULL)
41 xt_t->init(xt_t->t);
42 connman_iptables_globals.opts =
43- xtables_merge_options(connman_iptables_globals.opts,
44+ xtables_merge_options(
45+#if XTABLES_VERSION_CODE > 5
46+ connman_iptables_globals.orig_opts,
47+#endif
48+ connman_iptables_globals.opts,
49 xt_t->extra_opts,
50 &xt_t->option_offset);
51 if (connman_iptables_globals.opts == NULL)
52@@ -1102,7 +1106,11 @@
53 xt_m->init(xt_m->m);
54 if (xt_m != xt_m->next) {
55 connman_iptables_globals.opts =
56- xtables_merge_options(connman_iptables_globals.opts,
57+ xtables_merge_options(
58+#if XTABLES_VERSION_CODE > 5
59+ connman_iptables_globals.orig_opts,
60+#endif
61+ connman_iptables_globals.opts,
62 xt_m->extra_opts,
63 &xt_m->option_offset);
64 if (connman_iptables_globals.opts == NULL)
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
deleted file mode 100644
index c6e911baeb..0000000000
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1require connman.inc
2PR = "r4"
3
4EXTRA_OECONF += "\
5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
6 --disable-gtk-doc \
7 --enable-debug \
8 --enable-threads \
9 --enable-loopback \
10 --enable-ethernet \
11 ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
12 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
13 --enable-dnsproxy \
14 --disable-dhclient \
15 --enable-test \
16 --disable-polkit \
17 --enable-client \
18 --enable-ofono \
19 --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
20
21SRC_URI = "\
22 ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \
23 file://add_xuser_dbus_permission.patch \
24 file://xtables_version.patch \
25 file://connman \
26"
27
28SRC_URI[md5sum] = "9973cb89a11fff6b51fc85b51c13b711"
29SRC_URI[sha256sum] = "b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7"
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
new file mode 100644
index 0000000000..cc23c2871f
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -0,0 +1,10 @@
1require connman.inc
2
3PR = "r1"
4
5# 0.78 tag
6SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
7SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
8 file://add_xuser_dbus_permission.patch \
9 file://connman"
10S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 14:59:01 +0000