diff options
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-conf.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch | 153 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman_1.28.bb (renamed from meta/recipes-connectivity/connman/connman_1.25.bb) | 5 |
4 files changed, 98 insertions, 93 deletions
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index af726401e2..2358d9df09 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb @@ -9,6 +9,8 @@ SRC_URI_append_qemuall = "file://wired.config \ " PR = "r2" +S = "${WORKDIR}" + PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${localstatedir}/* ${libdir}/*" diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch index 0be516f054..f4049fa3e2 100644 --- a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch +++ b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch @@ -21,110 +21,110 @@ index c55e25c..9d818b2 100644 --- a/common/connman-client.c +++ b/common/connman-client.c @@ -289,7 +289,7 @@ gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, - - g_value_init(&value, DBUS_TYPE_G_DICTIONARY); - g_value_set_boxed(&value, ipv4); + + g_value_init(&value, DBUS_TYPE_G_DICTIONARY); + g_value_set_boxed(&value, ipv4); - ret = connman_set_property(proxy, "IPv4.Configuration", &value, NULL); + ret = net_connman_set_property(proxy, "IPv4.Configuration", &value, NULL); - - g_object_unref(proxy); - + + g_object_unref(proxy); + @@ -317,7 +317,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, - g_value_set_boolean(&value, powered); - - error = NULL; + g_value_set_boolean(&value, powered); + + error = NULL; - connman_set_property(proxy, "Powered", &value, &error); + net_connman_set_property(proxy, "Powered", &value, &error); - if( error ) - fprintf (stderr, "error: %s\n", error->message); - + if( error ) + fprintf (stderr, "error: %s\n", error->message); + @@ -325,7 +325,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, } - + void connman_client_scan(ConnmanClient *client, const gchar *device, - connman_scan_reply callback, gpointer user_data) + net_connman_scan_reply callback, gpointer user_data) { - ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); - DBusGProxy *proxy; + ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); + DBusGProxy *proxy; @@ -339,7 +339,7 @@ void connman_client_scan(ConnmanClient *client, const gchar *device, - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_scan_async(proxy, callback, user_data); + net_connman_scan_async(proxy, callback, user_data); - - g_object_unref(proxy); + + g_object_unref(proxy); } @@ -353,7 +353,7 @@ gboolean connman_client_get_offline_status(ConnmanClient *client) - - DBG("client %p", client); - + + DBG("client %p", client); + - ret = connman_get_properties(priv->manager, &hash, NULL); + ret = net_connman_get_properties(priv->manager, &hash, NULL); - - if (ret == FALSE) - goto done; + + if (ret == FALSE) + goto done; @@ -375,7 +375,7 @@ void connman_client_set_offlinemode(ConnmanClient *client, gboolean status) - g_value_init(&value, G_TYPE_BOOLEAN); - g_value_set_boolean(&value, status); - + g_value_init(&value, G_TYPE_BOOLEAN); + g_value_set_boolean(&value, status); + - connman_set_property(priv->manager, "OfflineMode", &value, NULL); + net_connman_set_property(priv->manager, "OfflineMode", &value, NULL); } - + static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, @@ -398,7 +398,7 @@ static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, - return TRUE; - - if (type == CONNMAN_TYPE_WIFI) + return TRUE; + + if (type == CONNMAN_TYPE_WIFI) - connman_disconnect(proxy, NULL); + net_connman_disconnect(proxy, NULL); - - g_object_unref(proxy); - + + g_object_unref(proxy); + @@ -422,13 +422,13 @@ void connman_client_connect(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_connect(proxy, NULL); + net_connman_connect(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } - + void connman_client_connect_async(ConnmanClient *client, const gchar *network, - connman_connect_reply callback, gpointer userdata) + net_connman_connect_reply callback, gpointer userdata) { - ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); - DBusGProxy *proxy; + ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); + DBusGProxy *proxy; @@ -446,7 +446,7 @@ void connman_client_connect_async(ConnmanClient *client, const gchar *network, - if (proxy == NULL) - goto done; - + if (proxy == NULL) + goto done; + - connman_connect_async(proxy, callback, userdata); + net_connman_connect_async(proxy, callback, userdata); - + done: - return; + return; @@ -476,7 +476,7 @@ void connman_client_disconnect(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_disconnect(proxy, NULL); + net_connman_disconnect(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } @@ -532,7 +532,7 @@ void connman_client_remove(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_remove(proxy, NULL); + net_connman_remove(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } diff --git a/common/connman-client.h b/common/connman-client.h index 9e2e6d5..98241de 100644 @@ -132,11 +132,11 @@ index 9e2e6d5..98241de 100644 +++ b/common/connman-client.h @@ -70,13 +70,13 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, - struct ipv4_config *ipv4_config); + struct ipv4_config *ipv4_config); void connman_client_scan(ConnmanClient *client, const gchar *device, - connman_scan_reply callback, gpointer user_data); + net_connman_scan_reply callback, gpointer user_data); - + void connman_client_connect(ConnmanClient *client, const gchar *network); void connman_client_disconnect(ConnmanClient *client, const gchar *network); gchar *connman_client_get_security(ConnmanClient *client, const gchar *network); @@ -144,30 +144,30 @@ index 9e2e6d5..98241de 100644 - connman_connect_reply callback, gpointer userdata); + net_connman_connect_reply callback, gpointer userdata); void connman_client_set_remember(ConnmanClient *client, const gchar *network, - gboolean remember); - + gboolean remember); + diff --git a/common/connman-dbus.c b/common/connman-dbus.c index b82b3e1..543eb43 100644 --- a/common/connman-dbus.c +++ b/common/connman-dbus.c @@ -655,15 +655,15 @@ DBusGProxy *connman_dbus_create_manager(DBusGConnection *conn, - - DBG("getting manager properties"); - + + DBG("getting manager properties"); + - connman_get_properties_async(proxy, manager_properties, store); + net_connman_get_properties_async(proxy, manager_properties, store); - - DBG("getting technologies"); - + + DBG("getting technologies"); + - connman_get_technologies_async(proxy, manager_technologies, store); + net_connman_get_technologies_async(proxy, manager_technologies, store); - - DBG("getting services"); - + + DBG("getting services"); + - connman_get_services_async(proxy, manager_services, store); + net_connman_get_services_async(proxy, manager_services, store); - - return proxy; + + return proxy; } diff --git a/common/connman-dbus.xml b/common/connman-dbus.xml index 56b9582..0199d52 100644 @@ -175,12 +175,13 @@ index 56b9582..0199d52 100644 +++ b/common/connman-dbus.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> - + <node name="/"> - <interface name="connman"> + <interface name="net.connman"> <method name="GetProperties"> <arg type="a{sv}" direction="out"/> </method> --- +-- 1.9.1 + diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index f121a81f1e..d068ba894a 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -13,6 +13,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" +inherit bluetooth + DEPENDS = "dbus glib-2.0 ppp iptables" INC_PR = "r20" @@ -27,12 +29,12 @@ EXTRA_OECONF += "\ --enable-test \ --disable-polkit \ --enable-client \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ " PACKAGECONFIG ??= "wispr \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ " @@ -40,8 +42,9 @@ PACKAGECONFIG ??= "wispr \ # local.conf or distro config # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" @@ -66,18 +69,16 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools-brokensep pkgconfig systemd update-rc.d - -do_configure_append () { - sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service -} +inherit autotools pkgconfig systemd update-rc.d # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. do_compile_append() { - sed -i -e s:deny:allow:g src/connman-dbus.conf - sed -i -e s:deny:allow:g vpn/vpn-dbus.conf + sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf + sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf + + sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service } do_install_append() { @@ -88,9 +89,9 @@ do_install_append() { fi install -d ${D}${bindir} - install -m 0755 ${S}/tools/*-test ${D}${bindir} - if [ -e ${S}/tools/wispr ]; then - install -m 0755 ${S}/tools/wispr ${D}${bindir} + install -m 0755 ${B}/tools/*-test ${D}${bindir} + if [ -e ${B}/tools/wispr ]; then + install -m 0755 ${B}/tools/wispr ${D}${bindir} fi install -m 0755 ${B}/client/connmanctl ${D}${bindir} @@ -113,10 +114,10 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ - xuser-account \ + ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/connman/connman_1.25.bb b/meta/recipes-connectivity/connman/connman_1.28.bb index 1758c95ee1..53e71fa000 100644 --- a/meta/recipes-connectivity/connman/connman_1.25.bb +++ b/meta/recipes-connectivity/connman/connman_1.28.bb @@ -5,7 +5,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://add_xuser_dbus_permission.patch \ file://connman \ " -SRC_URI[md5sum] = "a449d2e49871494506e48765747e6624" -SRC_URI[sha256sum] = "c1d266d6be18d2f66231f3537a7ed17b57637ca43c27328bc13c508cbeacce6e" +SRC_URI[md5sum] = "6e07c93877f80bb73c9d4dbfc697f3fc" +SRC_URI[sha256sum] = "b1d5e7dd2652725906e220a8b0206477e97080e835272971e3b2fd10943c5c94" RRECOMMENDS_${PN} = "connman-conf" + |