connman: upgrade and cleanup
cover connman: upgrade and cleanup
The following changes since commit 7a8f37daa7b42905233c31366915b897886a957a:
dev-manual: Updates to add Luna support for Eclipse (2015-05-03 11:49:35 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib Ciorga/PUs
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=Ciorga/PUs
Cristian Iorga (2):
connman: code cleanup
connman: upgrade to 1.29
meta/recipes-connectivity/connman/connman.inc | 13 ++----
...-create-dirs-before-putting-files-in-them.patch | 46 ++++++++++++++++++++++
.../connman/{connman_1.28.bb => connman_1.29.bb} | 5 ++-
3 files changed, 53 insertions(+), 11 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
rename meta/recipes-connectivity/connman/{connman_1.28.bb => connman_1.29.bb} (58%)Signature · 1 line
2.1.0
PATCH 1/2 connman: code cleanup
- cleanup multiple inherit lines;
- RDEPENDS cleanup, use PACKAGECONFIG[] instead.
Signed-off-by Cristian Iorga <[email protected]>
--- meta/recipes-connectivity/connman/connman.inc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
meta/recipes-connectivity/connman/connman.inc +4 -9
@@ -13,7 +13,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" -inherit bluetooth +inherit autotools pkgconfig systemd update-rc.d bluetooth DEPENDS = "dbus glib-2.0 ppp iptables"
@@ -43,9 +43,9 @@ PACKAGECONFIG ??= "wispr \ # 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[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" -PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" +PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" +PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"
@@ -69,8 +69,6 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -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.
@@ -114,9 +112,6 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \ "
Signature · 1 line
2.1.0
PATCH 2/2 connman: upgrade to 1.29
In reply to Cristian Iorga- Add support for Ethernet and VLAN usage;
- Fixes.
Added build-create-dirs-before-putting-files-in-them.patch, already submitted upstream.
Signed-off-by Cristian Iorga <[email protected]>
---
...-create-dirs-before-putting-files-in-them.patch | 46 ++++++++++++++++++++++
.../connman/{connman_1.28.bb => connman_1.29.bb} | 5 ++-
2 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
rename meta/recipes-connectivity/connman/{connman_1.28.bb => connman_1.29.bb} (58%)meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch new file +46 -0
@@ -0,0 +1,46 @@ +When automake's dependency tracking is enabled a mirror of the source tree is +created in the build directory as it writes the dependency information. + +However, if dependency tracking is disabled on an out-of-tree build this mirror +isn't created and it's possible that the .service files can't be written as the +directories they go into haven't been created yet (racing against the compiles, +which do create directories). + +Upstream-Status: Pending +Signed-off-by: Ross Burton <[email protected]> + +--- + Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 507736d..bc3c695 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -410,9 +410,11 @@ MAINTAINERCLEANFILES = Makefile.in \ + + + src/builtin.h: src/genbuiltin $(builtin_sources) ++ $(AM_V_AT)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ + + vpn/builtin.h: src/genbuiltin $(builtin_vpn_sources) ++ $(AM_V_AT)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_vpn_modules) > $@ + + src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf +@@ -449,9 +451,11 @@ do_subst = $(AM_V_GEN)$(SED) \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' + + %.service: %.service.in Makefile ++ $(AM_V_AT)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + + scripts/connman: scripts/connman.in Makefile ++ $(AM_V_at)$(MKDIR_P) scripts + $(do_subst) < $< > $@ + + include/connman/version.h: include/version.h +-- +2.1.4 +
meta/recipes-connectivity/connman/connman_1.29.bb renamed from meta/recipes-connectivity/connman/connman_1.28.bb +3 -2
@@ -3,10 +3,11 @@ require connman.inc SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://add_xuser_dbus_permission.patch \ + file://build-create-dirs-before-putting-files-in-them.patch \ file://connman \ " -SRC_URI[md5sum] = "6e07c93877f80bb73c9d4dbfc697f3fc" -SRC_URI[sha256sum] = "b1d5e7dd2652725906e220a8b0206477e97080e835272971e3b2fd10943c5c94" +SRC_URI[md5sum] = "5283884504860f5fba2e6f489f517293" +SRC_URI[sha256sum] = "2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594" RRECOMMENDS_${PN} = "connman-conf"
Signature · 1 line
2.1.0