diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-17 12:10:48 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-17 12:11:10 +0200 |
| commit | 9b389bd0696b7bbb33e15eeac1267c313ce9becb (patch) | |
| tree | a251494e8877935d7ec6bf6cb935b1f54e032674 /rules/connman.make | |
| parent | fe0cbadd7c0a81a6e320c7881eb98adeebc0ab45 (diff) | |
| download | ptxdist-9b389bd0696b7bbb33e15eeac1267c313ce9becb.tar.gz ptxdist-9b389bd0696b7bbb33e15eeac1267c313ce9becb.tar.xz | |
connman: version bump 1.30 -> 1.35
Also add patch to build with gcc 7.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/connman.make')
| -rw-r--r-- | rules/connman.make | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/rules/connman.make b/rules/connman.make index cc995a83b..2f671f7d4 100644 --- a/rules/connman.make +++ b/rules/connman.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CONNMAN) += connman # # Paths and names # -CONNMAN_VERSION := 1.30 -CONNMAN_MD5 := 3e4006236e53b61c966213331df91f35 +CONNMAN_VERSION := 1.35 +CONNMAN_MD5 := c082f39423ceed0cbf8f5fde07f4c9af CONNMAN := connman-$(CONNMAN_VERSION) CONNMAN_SUFFIX := tar.gz CONNMAN_URL := $(call ptx/mirror, KERNEL, network/connman/$(CONNMAN).$(CONNMAN_SUFFIX)) @@ -35,7 +35,9 @@ CONNMAN_LICENSE := GPL-2.0-only CONNMAN_CONF_TOOL := autoconf CONNMAN_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-optimization \ --disable-debug \ + --enable-pie \ --disable-hh2serial-gps \ --disable-openconnect \ --disable-openvpn \ @@ -53,6 +55,7 @@ CONNMAN_CONF_OPT := \ --$(call ptx/endis, PTXCONF_CONNMAN_ETHERNET)-ethernet \ --$(call ptx/endis, PTXCONF_CONNMAN_GADGET)-gadget \ --$(call ptx/endis, PTXCONF_CONNMAN_WIFI)-wifi \ + --disable-iwd \ --$(call ptx/endis, PTXCONF_CONNMAN_BLUETOOTH)-bluetooth \ --disable-ofono \ --disable-dundee \ @@ -63,7 +66,9 @@ CONNMAN_CONF_OPT := \ --$(call ptx/endis, PTXCONF_CONNMAN_CLIENT)-client \ --enable-datafiles \ --with-dbusconfdir=/usr/share \ - --with-systemdunitdir=/usr/lib/systemd/system + --with-systemdunitdir=/usr/lib/systemd/system \ + --with-tmpfilesdir=/usr/lib/tmpfiles.d \ + --with-firewall=iptables CONNMAN_TESTS := \ backtrace \ @@ -110,10 +115,6 @@ CONNMAN_TESTS := \ $(STATEDIR)/connman.install: @$(call targetinfo) @$(call install, CONNMAN) -ifdef PTXCONF_CONNMAN_CLIENT - install -D -m 755 "$(CONNMAN_DIR)/client/connmanctl" \ - "$(CONNMAN_PKGDIR)/usr/sbin/connmanctl" -endif ifdef PTXCONF_CONNMAN_TESTS @$(foreach test, $(CONNMAN_TESTS), \ install -D -m 755 "$(CONNMAN_DIR)/test/$(test)" \ @@ -174,7 +175,7 @@ endif # # command line client ifdef PTXCONF_CONNMAN_CLIENT - @$(call install_copy, connman, 0, 0, 0755, -, /usr/sbin/connmanctl) + @$(call install_copy, connman, 0, 0, 0755, -, /usr/bin/connmanctl) endif # # python tests |