diff options
Diffstat (limited to 'packages/connman')
| -rw-r--r-- | packages/connman/connman.inc | 31 | ||||
| -rw-r--r-- | packages/connman/connman_0.8.bb | 30 |
2 files changed, 50 insertions, 11 deletions
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc index 1ad46dea9d..1aa803608c 100644 --- a/packages/connman/connman.inc +++ b/packages/connman/connman.inc @@ -4,13 +4,16 @@ SECTION = "libs/network" LICENSE = "GPL" DEPENDS = "dbus glib-2.0" -EXTRA_OECONF += " \ +EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ - ac_cv_path_DHCLIENT=/sbin/dhclient " + ac_cv_path_DHCLIENT=/sbin/dhclient \ + ac_cv_path_UDHCPC=/sbin/udhcpc" INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "defaults 22" +PARALLEL_MAKE = "" + inherit autotools pkgconfig update-rc.d do_install_append() { @@ -22,15 +25,24 @@ do_stage() { } python populate_packages_prepend() { + depmap = dict( pppd="pppd", udhcp="udhcpc", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" ) + packages = [] + hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) plugin_name = bb.data.expand('${PN}-plugin-%s', d) - do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) + do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook ) + for (file, package) in packages: + plugintype = package.split( '-' )[-1] + if plugintype in depmap: + rdepends = bb.data.getVar( "RDEPENDS_%s" % package, d ) + bb.note( "Adding rdependency on %s to package %s" % ( depmap[plugintype], package ) ) + bb.data.setVar("RDEPENDS_%s" % package, depmap[plugintype], d) } -RDEPENDS = "dhcp-client wpa-supplicant resolvconf" - PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-script-dhclient" + +PACKAGES += "${PN}-scripts" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ @@ -38,7 +50,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" -FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*" -FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ - ${libdir}/connman/scripts/.debug" + +FILES_${PN}-scripts += "${libdir}/connman/scripts" +FILES_${PN}-dbg += "${libdir}/connman/*/.debug" +FILES_${PN}-dev += "${libdir}/connman/*/*.la" diff --git a/packages/connman/connman_0.8.bb b/packages/connman/connman_0.8.bb index 951b22cacd..2d5ad3b72a 100644 --- a/packages/connman/connman_0.8.bb +++ b/packages/connman/connman_0.8.bb @@ -1,7 +1,33 @@ require connman.inc -PR = "r0" +PR = "r2" -EXTRA_OECONF += "--disable-gtk-doc" +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" SRC_URI = "\ ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \ |