diff options
Diffstat (limited to 'meta/recipes-core/dbus')
22 files changed, 511 insertions, 613 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch b/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch deleted file mode 100644 index 106bfb4c57..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch +++ /dev/null @@ -1,144 +0,0 @@ -Add install-ptest rules. -Change TEST_ENVIRONMENT to allow running outside build dir. - - Makefile.am | 7 +++++++ - bus/Makefile.am | 6 ++++++ - dbus/Makefile.am | 6 ++++++ - doc/Makefile.am | 4 ++++ - test/Makefile.am | 25 ++++++++++++++++++++----- - test/name-test/Makefile.am | 9 +++++++++ - tools/Makefile.am | 12 ++++++++++++ - 7 files changed, 64 insertions(+), 5 deletions(-) - -Signed-off-by: Björn Stenberg <bjst@enea.com> -Upstream-Status: Pending - -diff -ur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2012-12-06 14:34:01.157414449 +0100 -+++ b/Makefile.am 2012-12-06 15:21:14.447113035 +0100 -@@ -30,4 +30,11 @@ - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -+if DBUS_BUILD_TESTS -+install-ptest: -+ @for subdir in $(SUBDIRS); do \ -+ $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ -+ done -+endif -+ - include tools/lcov.am -diff -ur a/bus/Makefile.am b/bus/Makefile.am ---- a/bus/Makefile.am 2012-12-06 14:34:01.169413931 +0100 -+++ b/bus/Makefile.am 2012-12-06 15:21:14.463112346 +0100 -@@ -290,3 +290,9 @@ - #### Extra dist - - EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) -+ -+if DBUS_BUILD_TESTS -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR) -+ @install $(dbus_daemon_exec_PROGRAMS) $(noinst_PROGRAMS) $(DESTDIR) -+endif -diff -ur a/dbus/Makefile.am b/dbus/Makefile.am ---- a/dbus/Makefile.am 2012-12-06 14:34:01.161414276 +0100 -+++ b/dbus/Makefile.am 2012-12-06 15:21:14.451112862 +0100 -@@ -310,3 +310,9 @@ - update-systemd: - curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c - curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h -+ -+if DBUS_BUILD_TESTS -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR) -+ @install $(noinst_PROGRAMS) $(DESTDIR) -+endif -diff -ur a/test/Makefile.am b/test/Makefile.am ---- a/test/Makefile.am 2012-12-06 14:34:01.165414103 +0100 -+++ b/test/Makefile.am 2012-12-06 15:21:14.455112690 +0100 -@@ -119,12 +119,13 @@ - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ - DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) - -+ptest_run_dir = .. -+ - TESTS_ENVIRONMENT = \ -- DBUS_BLOCK_ON_ABORT=1 \ -- DBUS_FATAL_WARNINGS=1 \ -- DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ -- DBUS_TEST_DATA=@abs_top_builddir@/test/data \ -- DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ -+ DBUS_FATAL_WARNINGS=0 \ -+ DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ -+ DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ -+ DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ - $(NULL) - - test_corrupt_SOURCES = corrupt.c -@@ -325,3 +326,18 @@ - data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf - $(AM_V_at)$(MKDIR_P) data/valid-config-files - $(AM_V_GEN)cp $< $@ -+ -+if DBUS_BUILD_TESTS -+install-ptest: install-ptest-nonrecursive -+ @for subdir in $(SUBDIRS); do \ -+ if [ $$subdir != "." ]; then \ -+ $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ -+ fi; \ -+ done -+ -+install-ptest-nonrecursive: -+ @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d -+ @for file in Makefile $(installable_tests) $(EXTRA_DIST) $(noinst_DATA); do \ -+ install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ -+ done; -+endif -diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am ---- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100 -+++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100 -@@ -36,4 +36,13 @@ - test_privserver_client_LDADD=../libdbus-testutils.la - test_autolaunch_LDADD=../libdbus-testutils.la - -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR) -+ @for file in Makefile $(noinst_PROGRAMS) $(EXTRA_DIST); do \ -+ if [ -f .libs/$$file ]; then \ -+ install .libs/$$file $(DESTDIR); \ -+ else \ -+ install $$file $(DESTDIR); \ -+ fi \ -+ done; - endif -diff -ur a/tools/Makefile.am b/tools/Makefile.am ---- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100 -+++ b/tools/Makefile.am 2012-12-06 15:21:14.455112690 +0100 -@@ -78,3 +78,15 @@ - - installcheck-local: - test -d $(DESTDIR)$(localstatedir)/lib/dbus -+ -+if DBUS_BUILD_TESTS -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR) -+ @for file in $(bin_PROGRAMS); do \ -+ if [ -f .libs/$$file ]; then \ -+ install .libs/$$file $(DESTDIR); \ -+ else \ -+ install $$file $(DESTDIR); \ -+ fi; \ -+ done; -+endif -diff -ur a/doc/Makefile.am b/doc/Makefile.am ---- a/doc/Makefile.am 2012-06-06 12:45:55.000000000 +0200 -+++ b/doc/Makefile.am 2012-12-06 16:04:58.990070587 +0100 -@@ -174,3 +174,7 @@ - - maintainer-clean-local: - rm -f $(XMLTO_OUTPUT) -+ -+if DBUS_BUILD_TESTS -+install-ptest: -+endif diff --git a/meta/recipes-core/dbus/dbus-1.6.8/run-ptest b/meta/recipes-core/dbus/dbus-1.6.8/run-ptest deleted file mode 100755 index e08ecb1a63..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd test -make -k runtest-TESTS diff --git a/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch b/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch deleted file mode 100644 index ae1291c947..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch +++ /dev/null @@ -1,187 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From d728fdc655f17031da3bb129ab2fd17dadf0fe3a Mon Sep 17 00:00:00 2001 -From: Simon Peeters <peeters.simon@gmail.com> -Date: Sun, 07 Oct 2012 14:59:30 +0000 -Subject: Set correct address when using --address=systemd: - -When dbus gets launched through systemd, we need to create an address -string based on the sockets passed. - -The _dbus_append_addres_from_socket() function is responsible for -extracting the address information from the file-descriptor and -formatting it in a dbus friendly way. - -This fixes bus activation when running dbus under a systemd session. - -https://bugs.freedesktop.org/show_bug.cgi?id=50962 - -Signed-off-by: Simon Peeters <peeters.simon@gmail.com> ---- -diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c -index 130f66e..d995240 100644 ---- a/dbus/dbus-server-unix.c -+++ b/dbus/dbus-server-unix.c -@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, - } - else if (strcmp (method, "systemd") == 0) - { -- int n, *fds; -+ int i, n, *fds; - DBusString address; - - n = _dbus_listen_systemd_sockets (&fds, error); -@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, - return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; - } - -- _dbus_string_init_const (&address, "systemd:"); -+ if (!_dbus_string_init (&address)) -+ goto systemd_oom; - -- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); -- if (*server_p == NULL) -+ for (i = 0; i < n; i++) - { -- int i; -- -- for (i = 0; i < n; i++) -+ if (i > 0) - { -- _dbus_close_socket (fds[i], NULL); -+ if (!_dbus_string_append (&address, ";")) -+ goto systemd_oom; - } -- dbus_free (fds); -- -- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); -- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; -+ if (!_dbus_append_address_from_socket (fds[i], &address, error)) -+ goto systemd_err; - } - -+ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); -+ if (*server_p == NULL) -+ goto systemd_oom; -+ - dbus_free (fds); - - return DBUS_SERVER_LISTEN_OK; -- } -+ systemd_oom: -+ _DBUS_SET_OOM (error); -+ systemd_err: -+ for (i = 0; i < n; i++) -+ { -+ _dbus_close_socket (fds[i], NULL); -+ } -+ dbus_free (fds); -+ _dbus_string_free (&address); -+ -+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; -+ } - #ifdef DBUS_ENABLE_LAUNCHD - else if (strcmp (method, "launchd") == 0) - { -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index b4ecc96..55743b1 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -55,6 +55,7 @@ - #include <netinet/in.h> - #include <netdb.h> - #include <grp.h> -+#include <arpa/inet.h> - - #ifdef HAVE_ERRNO_H - #include <errno.h> -@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void) - #endif - } - -+/** -+ * Read the address from the socket and append it to the string -+ * -+ * @param fd the socket -+ * @param address -+ * @param error return location for error code -+ */ -+dbus_bool_t -+_dbus_append_address_from_socket (int fd, -+ DBusString *address, -+ DBusError *error) -+{ -+ union { -+ struct sockaddr sa; -+ struct sockaddr_storage storage; -+ struct sockaddr_un un; -+ struct sockaddr_in ipv4; -+ struct sockaddr_in6 ipv6; -+ } socket; -+ char hostip[INET6_ADDRSTRLEN]; -+ int size = sizeof (socket); -+ -+ if (getsockname (fd, &socket.sa, &size)) -+ goto err; -+ -+ switch (socket.sa.sa_family) -+ { -+ case AF_UNIX: -+ if (socket.un.sun_path[0]=='\0') -+ { -+ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1]))) -+ return TRUE; -+ } -+ else -+ { -+ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path)) -+ return TRUE; -+ } -+ break; -+ case AF_INET: -+ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip))) -+ if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u", -+ hostip, ntohs (socket.ipv4.sin_port))) -+ return TRUE; -+ break; -+#ifdef AF_INET6 -+ case AF_INET6: -+ if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip))) -+ if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u", -+ hostip, ntohs (socket.ipv6.sin6_port))) -+ return TRUE; -+ break; -+#endif -+ default: -+ dbus_set_error (error, -+ _dbus_error_from_errno (EINVAL), -+ "Failed to read address from socket: Unknown socket type."); -+ return FALSE; -+ } -+ err: -+ dbus_set_error (error, -+ _dbus_error_from_errno (errno), -+ "Failed to open socket: %s", -+ _dbus_strerror (errno)); -+ return FALSE; -+} -+ - /* tests in dbus-sysdeps-util.c */ -diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h -index 9b70896..a265b33 100644 ---- a/dbus/dbus-sysdeps-unix.h -+++ b/dbus/dbus-sysdeps-unix.h -@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str, - - void _dbus_close_all (void); - -+dbus_bool_t _dbus_append_address_from_socket (int fd, -+ DBusString *address, -+ DBusError *error); -+ - /** @} */ - - DBUS_END_DECLS --- -cgit v0.9.0.2-2-gbebe diff --git a/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch b/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch deleted file mode 100644 index 5c08c9354a..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch +++ /dev/null @@ -1,26 +0,0 @@ - - -Signed-off-by: Björn Stenberg <bjst@enea.com> -Upstream-Status: Pending - ---- a/test/Makefile.am 2012-06-15 15:25:43.000000000 +0200 -+++ b/test/Makefile.am 2012-11-16 09:24:44.263140840 +0100 -@@ -119,12 +119,13 @@ - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ - DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) - -+ptest_run_dir = .. -+ - TESTS_ENVIRONMENT = \ -- DBUS_BLOCK_ON_ABORT=1 \ -- DBUS_FATAL_WARNINGS=1 \ -- DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ -- DBUS_TEST_DATA=@abs_top_builddir@/test/data \ -- DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ -+ DBUS_FATAL_WARNINGS=0 \ -+ DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ -+ DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ -+ DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ - $(NULL) - - test_corrupt_SOURCES = corrupt.c diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch deleted file mode 100644 index 40e3b12b5d..0000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac ---- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300 -+++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200 -@@ -8,7 +8,7 @@ - - AM_INIT_AUTOMAKE([1.9]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - # Honor aclocal flags - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 973c995863..55f710f857 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -13,10 +13,9 @@ DEPENDS_class-native = "glib-2.0-native dbus-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ file://test-install-makefile.patch \ - file://obsolete_automake_macros.patch \ " -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext bash-completion gtk-doc #default disable regression tests, some unit test code in non testing code #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf @@ -27,18 +26,14 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" -PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests" +PACKAGES += "${PN}-tests" FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ - ${libexecdir}/dbus-bash-completion-helper" +FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" FILES_${PN}-dev += "${bindir}/dbus-binding-tool" RDEPENDS_${PN}-tests += "dbus-x11" -FILES_${PN}-tests = "${datadir}/${PN}/tests" -FILES_${PN}-tests-dbg = "${datadir}/${PN}/tests/.debug/* \ - ${datadir}/${PN}/tests/core/.debug/* \ - ${datadir}/${PN}/tests/interfaces/.debug/*" +FILES_${PN}-tests = "${datadir}/${BPN}/tests" BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch index fbb4967828..fbb4967828 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch index 2e8e178bb7..027c82b27e 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch +++ b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch @@ -3,26 +3,46 @@ Change Makefile.am to install regression tests for test package purpose. Upstream-Status: Inappropriate [test not install is for purpose from upstream] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + test/Makefile.am | 3 ++- + test/core/Makefile.am | 3 ++- + test/interfaces/Makefile.am | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am -index 7ba11a8..249f0e7 100644 +index 379c8c3..6580927 100644 --- a/test/Makefile.am +++ b/test/Makefile.am -@@ -13,7 +13,8 @@ else - TEST_BINARIES= - endif +@@ -48,7 +48,8 @@ TESTS = \ + $(test_scripts) \ + $(NULL) --noinst_PROGRAMS= $(TEST_BINARIES) +-noinst_PROGRAMS = \ +testdir = $(datadir)/@PACKAGE@/tests -+test_PROGRAMS= $(TEST_BINARIES) ++test_PROGRAMS = \ + $(test_programs) \ + $(test_related_programs) \ + $(NULL) +diff --git a/test/core/Makefile.am b/test/core/Makefile.am +index e4bceb4..54b077d 100644 +--- a/test/core/Makefile.am ++++ b/test/core/Makefile.am +@@ -64,7 +64,8 @@ endif - test_service_SOURCES= \ - test-service.c + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = \ ++testdir = $(datadir)/@PACKAGE@/tests/core ++test_PROGRAMS = \ + test-dbus-glib \ + test-error-mapping \ + test-service-glib \ diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am -index 3cb2c39..e6de67d 100644 +index a94d08d..707dcac 100644 --- a/test/interfaces/Makefile.am +++ b/test/interfaces/Makefile.am -@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS +@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" @@ -32,17 +52,6 @@ index 3cb2c39..e6de67d 100644 test_service_SOURCES = \ test-interfaces.c \ -diff --git a/test/core/Makefile.am b/test/core/Makefile.am -index ef6cb26..9786c3a 100644 ---- a/test/core/Makefile.am -+++ b/test/core/Makefile.am -@@ -46,7 +46,8 @@ endif - - ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we - ## build even when not doing "make check" --noinst_PROGRAMS = \ -+testdir = $(datadir)/@PACKAGE@/tests/core -+test_PROGRAMS = \ - test-dbus-glib \ - test-service-glib \ - $(THREAD_APPS) \ +-- +1.9.1 + diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb deleted file mode 100644 index e08e3564d1..0000000000 --- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dbus-glib.inc - -PR = "r0" - -SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e" -SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5" diff --git a/meta/recipes-core/dbus/dbus-glib_0.108.bb b/meta/recipes-core/dbus/dbus-glib_0.108.bb new file mode 100644 index 0000000000..7a9a69e1e9 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib_0.108.bb @@ -0,0 +1,4 @@ +require dbus-glib.inc + +SRC_URI[md5sum] = "a66a613705870752ca9786e0359aea97" +SRC_URI[sha256sum] = "9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c" diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb deleted file mode 100644 index d00819a8dc..0000000000 --- a/meta/recipes-core/dbus/dbus-ptest_1.6.8.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "D-Bus test package, only used for D-bus functionality test." -HOMEPAGE = "http://dbus.freedesktop.org" -SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ - file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" - -DEPENDS = "python-pygobject dbus dbus-glib" - -RDEPENDS_${PN} += "make" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ - file://tmpdir.patch \ - file://ptest.patch \ - file://dbus-1.init \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "3bf059c7dd5eda5f539a1b7cfe7a14a2" -SRC_URI[sha256sum] = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac" - -S="${WORKDIR}/dbus-${PV}" -FILESPATH = "${FILE_DIRNAME}/dbus-${PV}" - -inherit autotools pkgconfig gettext ptest - -EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_virtclass-native = "--without-x" - -EXTRA_OECONF = "--enable-tests \ - --enable-modular-tests \ - --enable-installed-tests \ - --enable-checks \ - --enable-asserts \ - --enable-verbose-mode \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-libaudit \ - --with-xml=expat \ - --with-systemdsystemunitdir=${systemd_unitdir}/system/ \ - ${EXTRA_OECONF_X}" - -do_install() { -} - -do_install_ptest() { - find ${D}${PTEST_PATH} -name Makefile | xargs sed -i 's/^Makefile:/_Makefile:/' -} diff --git a/meta/recipes-core/dbus/dbus-test_1.10.14.bb b/meta/recipes-core/dbus/dbus-test_1.10.14.bb new file mode 100644 index 0000000000..5394814726 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-test_1.10.14.bb @@ -0,0 +1,58 @@ +SUMMARY = "D-Bus test package (for D-bus functionality testing only)" +HOMEPAGE = "http://dbus.freedesktop.org" +SECTION = "base" +LICENSE = "AFL-2 | GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ + file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" + +DEPENDS = "dbus glib-2.0" + +RDEPENDS_${PN} += "make" +RDEPENDS_${PN}-dev = "" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://tmpdir.patch \ + file://run-ptest \ + file://python-config.patch \ + file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ + " + +SRC_URI[md5sum] = "3f7b013ce8f641cd4c897acda0ef3467" +SRC_URI[sha256sum] = "23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083" + +S="${WORKDIR}/dbus-${PV}" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" + +inherit autotools pkgconfig gettext ptest upstream-version-is-even + +EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" +EXTRA_OECONF_X_class-native = "--without-x" + +EXTRA_OECONF = "--enable-tests \ + --enable-modular-tests \ + --enable-installed-tests \ + --enable-checks \ + --enable-asserts \ + --enable-verbose-mode \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --disable-libaudit \ + --disable-systemd \ + --without-systemdsystemunitdir \ + --with-dbus-test-dir=${PTEST_PATH} \ + ${EXTRA_OECONF_X}" + +do_install() { + : +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + l="shell printf refs syslog marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay" + for i in $l; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done + l="bus bus-system bus-launch-helper" + for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test; done + install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test + cp -r ${B}/test/data ${D}${PTEST_PATH}/test +} +RDEPENDS_${PN}-ptest += "bash" diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc deleted file mode 100644 index 2be5bda101..0000000000 --- a/meta/recipes-core/dbus/dbus.inc +++ /dev/null @@ -1,141 +0,0 @@ -SUMMARY = "D-Bus message bus" -DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." -HOMEPAGE = "http://dbus.freedesktop.org" -SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ - file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -X11DEPENDS = "virtual/libx11 libsm" -DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -DEPENDS_class-native = "expat-native virtual/libintl-native" -DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl" -RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" -RDEPENDS_class-native = "" - -INC_PR = "r6" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ - file://tmpdir.patch; \ - file://systemd-address.patch \ - file://dbus-1.init" - -inherit useradd autotools pkgconfig gettext update-rc.d - -INITSCRIPT_NAME = "dbus-1" -INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." - -python __anonymous() { - features = d.getVar("DISTRO_FEATURES", True).split() - if "sysvinit" not in features: - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r netdev" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ - --no-create-home --shell /bin/false \ - --user-group messagebus" - -CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" - -DEBIANNAME_${PN} = "dbus-1" - -PACKAGES =+ "${PN}-lib" - -OLDPKGNAME = "dbus-x11" -OLDPKGNAME_class-nativesdk = "" - -# for compatibility -RPROVIDES_${PN} = "${OLDPKGNAME}" -RREPLACES_${PN} += "${OLDPKGNAME}" - -FILES_${PN} = "${bindir}/dbus-daemon* \ - ${bindir}/dbus-uuidgen \ - ${bindir}/dbus-cleanup-sockets \ - ${bindir}/dbus-send \ - ${bindir}/dbus-monitor \ - ${bindir}/dbus-launch \ - ${libexecdir}/dbus* \ - ${sysconfdir} \ - ${localstatedir} \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ - ${systemd_unitdir}/system/" -FILES_${PN}-lib = "${libdir}/lib*.so.*" -RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" - -pkg_postinst_dbus() { - if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - /etc/init.d/populate-volatile.sh update - fi -} - -EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" -# TODO: would like to --enable-systemd but that's a circular build-dependency -# between systemd<->dbus -EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -EXTRA_OECONF = "--disable-tests \ - --disable-checks \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-libaudit \ - --with-xml=expat \ - --disable-systemd \ - ${EXTRA_OECONF_SYSTEMD} \ - ${EXTRA_OECONF_X}" - -do_install() { - autotools_do_install - - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh - install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 - fi - - install -d ${D}${sysconfdir}/default/volatiles - echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ - > ${D}${sysconfdir}/default/volatiles/99_dbus - - - mkdir -p ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus - - chown messagebus:messagebus ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus - - chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper - chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper - - # Remove Red Hat initscript - rm -rf ${D}${sysconfdir}/rc.d - - # Remove empty testexec directory as we don't build tests - rm -rf ${D}${libdir}/dbus-1.0/test -} - -do_install_class-native() { - autotools_do_install - - # for dbus-glib-native introspection generation - install -d ${STAGING_DATADIR_NATIVE}/dbus/ - # N.B. is below install actually required? - install -m 0644 bus/session.conf ${STAGING_DATADIR_NATIVE}/dbus/session.conf - - # dbus-glib-native and dbus-glib need this xml file - ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml - - # dbus-launch has no X support so lets not install it in case the host - # has a more featured and useful version - rm -f ${D}${bindir}/dbus-launch -} - -do_install_class-nativesdk() { - autotools_do_install - - # dbus-launch has no X support so lets not install it in case the host - # has a more featured and useful version - rm -f ${D}${bindir}/dbus-launch -} -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch b/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch new file mode 100644 index 0000000000..85acb7b1ca --- /dev/null +++ b/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch @@ -0,0 +1,38 @@ +From 1bfde222926be624a30a6e4b2cdc2c5064a36298 Mon Sep 17 00:00:00 2001 +From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> +Date: Fri, 29 Jul 2016 01:19:37 +0300 +Subject: [PATCH] configure.ac: explicitely check stdint.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit < |