[ptxdist] [PATCH v2 03/22] dbus: version bump 1.10.24 -> 1.12.2
Also fixup configure options for dbus and host-dbus. Signed-off-by: Clemens Gruber --- Changes since v1: - Updated the previously forgotten host rule file rules/dbus.make | 13 +++-- rules/host-dbus.make | 15 +++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/rules/dbus.make b/rules/dbus.make index bbf602625..1ba7ad3d2 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.10.24 -DBUS_MD5 := d548ae16f9a3268fe4650ccc86a3f06f +DBUS_VERSION := 1.12.2 +DBUS_MD5 := 3361456cadb99aa6601bed5b48964254 DBUS := dbus-$(DBUS_VERSION) DBUS_SUFFIX:= tar.gz DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) @@ -38,11 +38,10 @@ DBUS_CONF_TOOL := autoconf DBUS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --enable-silent-rules \ + --disable-developer \ + --disable-debug \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-static \ - --disable-compiler-coverage \ - --enable-compiler-optimisations \ - --disable-developer \ --disable-ansi \ --disable-verbose-mode \ --disable-asserts \ @@ -50,7 +49,6 @@ DBUS_CONF_OPT := \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-ducktype-docs \ - --enable-abstract-sockets=yes \ --$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \ --disable-apparmor \ --disable-libaudit \ @@ -63,9 +61,12 @@ DBUS_CONF_OPT:= \ --disable-modular-tests \ --disable-tests \ --disable-installed-tests \ + --disable-code-coverage \ --enable-epoll \ --$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \ + --disable-compile-warnings \ --disable-Werror \ + --disable-relocation \ --disable-stats \ --$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \ --with-dbus-user=messagebus \ diff --git a/rules/host-dbus.make b/rules/host-dbus.make index 837cf77d4..407da479f 100644 --- a/rules/host-dbus.make +++ b/rules/host-dbus.make @@ -29,8 +29,10 @@ HOST_DBUS_CONF_TOOL := autoconf HOST_DBUS_CONF_OPT := \ $(HOST_AUTOCONF) \ --enable-silent-rules \ + --disable-developer \ + --disable-debug \ + --enable-largefile \ --disable-static \ - --disable-compiler-coverage \ --disable-ansi \ --disable-verbose-mode \ --disable-asserts \ @@ -38,22 +40,27 @@ HOST_DBUS_CONF_OPT := \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-ducktype-docs \ - --enable-abstract-sockets=yes \ --disable-selinux \ --disable-apparmor \ --disable-libaudit \ --disable-inotify \ --disable-kqueue \ --disable-console-owner-file \ + --disable-launchd \ --disable-systemd \ --disable-embedded-tests \ --disable-modular-tests \ --disable-tests \ + --disable-installed-tests \ + --disable-code-coverage \ --disable-epoll \ --disable-x11-autolaunch \ + --disable-compile-warnings \ + --disable-Werror \ + --disable-relocation \ --disable-stats \ --disable-user-session \ - --without-x \ - --without-valgrind + --without-valgrind \ + --without-x # vim: syntax=make -- 2.16.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 03/22] dbus: version bump 1.10.24 -> 1.12.2
On Tue, Jan 16, 2018 at 04:50:21PM +0100, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber You need to update host-dbus as well: [...] - target: host-dbus.prepare - configure: error: unrecognized options: --disable-compiler-coverage, --enable-abstract-sockets [...] Michael > --- > rules/dbus.make | 13 +++-- > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/rules/dbus.make b/rules/dbus.make > index bbf602625..1ba7ad3d2 100644 > --- a/rules/dbus.make > +++ b/rules/dbus.make > @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus > # > # Paths and names > # > -DBUS_VERSION := 1.10.24 > -DBUS_MD5 := d548ae16f9a3268fe4650ccc86a3f06f > +DBUS_VERSION := 1.12.2 > +DBUS_MD5 := 3361456cadb99aa6601bed5b48964254 > DBUS := dbus-$(DBUS_VERSION) > DBUS_SUFFIX := tar.gz > DBUS_URL := > http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) > @@ -38,11 +38,10 @@ DBUS_CONF_TOOL:= autoconf > DBUS_CONF_OPT:= \ > $(CROSS_AUTOCONF_USR) \ > --enable-silent-rules \ > + --disable-developer \ > + --disable-debug \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-static \ > - --disable-compiler-coverage \ > - --enable-compiler-optimisations \ > - --disable-developer \ > --disable-ansi \ > --disable-verbose-mode \ > --disable-asserts \ > @@ -50,7 +49,6 @@ DBUS_CONF_OPT := \ > --disable-xml-docs \ > --disable-doxygen-docs \ > --disable-ducktype-docs \ > - --enable-abstract-sockets=yes \ > --$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \ > --disable-apparmor \ > --disable-libaudit \ > @@ -63,9 +61,12 @@ DBUS_CONF_OPT := \ > --disable-modular-tests \ > --disable-tests \ > --disable-installed-tests \ > + --disable-code-coverage \ > --enable-epoll \ > --$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \ > + --disable-compile-warnings \ > --disable-Werror \ > + --disable-relocation \ > --disable-stats \ > --$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \ > --with-dbus-user=messagebus \ > -- > 2.15.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
