diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-05-14 17:29:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-15 23:24:42 +0100 |
commit | 48fc1aac623347eaed87ec640aab0376839569c7 (patch) | |
tree | c9a5194cbb8573c7c0cf76603196ccde67490136 | |
parent | 53082b1ae6df280afa9b7548fef93c9409cd7352 (diff) | |
download | poky-48fc1aac623347eaed87ec640aab0376839569c7.tar.gz |
dbus: Update to 1.8.2 version
Upgrade dbus to 1.8.2.
Modify ptest suite to make it enabled on new version.
If systemd in DISTRO_FEATURES, we expect to install dbus systemd
unit files.
Remove unneeded patches since it's included in new version.
Remove unrecognized option: "--with-xml"
[YOCTO #6092]
(From OE-Core rev: 596470547451084944082cbed50351ad0d912255)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.8.2.bb (renamed from meta/recipes-core/dbus/dbus-test_1.6.18.bb) | 13 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 14 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch | 193 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch | 45 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus/ptest.patch | 154 | ||||
-rwxr-xr-x | meta/recipes-core/dbus/dbus/run-ptest | 11 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.6.18.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.8.2.bb | 4 |
8 files changed, 34 insertions, 404 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb b/meta/recipes-core/dbus/dbus-test_1.8.2.bb index 6ec9dfe78c..9c7b7492b7 100644 --- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb +++ b/meta/recipes-core/dbus/dbus-test_1.8.2.bb | |||
@@ -12,7 +12,6 @@ RDEPENDS_${PN}-dev = "" | |||
12 | 12 | ||
13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 13 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ |
14 | file://tmpdir.patch \ | 14 | file://tmpdir.patch \ |
15 | file://ptest.patch \ | ||
16 | file://dbus-1.init \ | 15 | file://dbus-1.init \ |
17 | file://run-ptest \ | 16 | file://run-ptest \ |
18 | file://python-config.patch \ | 17 | file://python-config.patch \ |
@@ -39,7 +38,6 @@ EXTRA_OECONF = "--enable-tests \ | |||
39 | --disable-xml-docs \ | 38 | --disable-xml-docs \ |
40 | --disable-doxygen-docs \ | 39 | --disable-doxygen-docs \ |
41 | --disable-libaudit \ | 40 | --disable-libaudit \ |
42 | --with-xml=expat \ | ||
43 | --disable-systemd \ | 41 | --disable-systemd \ |
44 | --without-systemdsystemunitdir \ | 42 | --without-systemdsystemunitdir \ |
45 | --with-dbus-test-dir=${PTEST_PATH} \ | 43 | --with-dbus-test-dir=${PTEST_PATH} \ |
@@ -49,5 +47,14 @@ do_install() { | |||
49 | } | 47 | } |
50 | 48 | ||
51 | do_install_ptest() { | 49 | do_install_ptest() { |
52 | find ${D}${PTEST_PATH} -name Makefile | xargs sed -i 's/^Makefile:/_Makefile:/' | 50 | install -d ${D}${PTEST_PATH}/test |
51 | case1="shell printf refs syslog" | ||
52 | for i in ${case1}; do install ${B}/test/test-$i ${D}${PTEST_PATH}/test; done | ||
53 | case2="marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay" | ||
54 | for i in ${case2}; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done | ||
55 | case3="bus bus-system bus-launch-helper" | ||
56 | for i in ${case3}; do install ${B}/bus/test-$i ${D}${PTEST_PATH}/test; done | ||
57 | install ${B}/dbus/test-dbus ${D}${PTEST_PATH}/test | ||
58 | cp -r ${B}/test/data ${D}${PTEST_PATH}/test | ||
53 | } | 59 | } |
60 | RDEPENDS_${PN}-ptest += "bash" | ||
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 4510ae3e95..b3d3834dd0 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -17,8 +17,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | |||
17 | file://dbus-1.init \ | 17 | file://dbus-1.init \ |
18 | file://os-test.patch \ | 18 | file://os-test.patch \ |
19 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 19 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
20 | file://Set-correct-address-when-using-address-systemd.patch \ | ||
21 | file://fixed-memory-freeing-if-error-during-listing-service.patch \ | ||
22 | " | 20 | " |
23 | 21 | ||
24 | inherit useradd autotools pkgconfig gettext update-rc.d | 22 | inherit useradd autotools pkgconfig gettext update-rc.d |
@@ -56,6 +54,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ | |||
56 | ${bindir}/dbus-send \ | 54 | ${bindir}/dbus-send \ |
57 | ${bindir}/dbus-monitor \ | 55 | ${bindir}/dbus-monitor \ |
58 | ${bindir}/dbus-launch \ | 56 | ${bindir}/dbus-launch \ |
57 | ${bindir}/dbus-run-session \ | ||
59 | ${libexecdir}/dbus* \ | 58 | ${libexecdir}/dbus* \ |
60 | ${sysconfdir} \ | 59 | ${sysconfdir} \ |
61 | ${localstatedir} \ | 60 | ${localstatedir} \ |
@@ -84,7 +83,6 @@ EXTRA_OECONF = "--disable-tests \ | |||
84 | --disable-xml-docs \ | 83 | --disable-xml-docs \ |
85 | --disable-doxygen-docs \ | 84 | --disable-doxygen-docs \ |
86 | --disable-libaudit \ | 85 | --disable-libaudit \ |
87 | --with-xml=expat \ | ||
88 | --disable-systemd" | 86 | --disable-systemd" |
89 | 87 | ||
90 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 88 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
@@ -106,6 +104,16 @@ do_install() { | |||
106 | install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 | 104 | install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 |
107 | fi | 105 | fi |
108 | 106 | ||
107 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
108 | for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ | ||
109 | install -d ${D}${systemd_unitdir}/system/$i; done | ||
110 | install ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ | ||
111 | cd ${D}${systemd_unitdir}/system/dbus.target.wants/ | ||
112 | ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket | ||
113 | ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket | ||
114 | ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service | ||
115 | fi | ||
116 | |||
109 | install -d ${D}${sysconfdir}/default/volatiles | 117 | install -d ${D}${sysconfdir}/default/volatiles |
110 | echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ | 118 | echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ |
111 | > ${D}${sysconfdir}/default/volatiles/99_dbus | 119 | > ${D}${sysconfdir}/default/volatiles/99_dbus |
diff --git a/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch b/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch deleted file mode 100644 index 1fca9bb254..0000000000 --- a/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch +++ /dev/null | |||
@@ -1,193 +0,0 @@ | |||
1 | From d728fdc655f17031da3bb129ab2fd17dadf0fe3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Peeters <peeters.simon@gmail.com> | ||
3 | Date: Sun, 7 Oct 2012 16:59:30 +0200 | ||
4 | Subject: [PATCH] Set correct address when using --address=systemd: | ||
5 | |||
6 | When dbus gets launched through systemd, we need to create an address | ||
7 | string based on the sockets passed. | ||
8 | |||
9 | The _dbus_append_addres_from_socket() function is responsible for | ||
10 | extracting the address information from the file-descriptor and | ||
11 | formatting it in a dbus friendly way. | ||
12 | |||
13 | This fixes bus activation when running dbus under a systemd session. | ||
14 | |||
15 | https://bugs.freedesktop.org/show_bug.cgi?id=50962 | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: Simon Peeters <peeters.simon@gmail.com> | ||
20 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
21 | --- | ||
22 | dbus/dbus-server-unix.c | 38 ++++++++++++++++++--------- | ||
23 | dbus/dbus-sysdeps-unix.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ | ||
24 | dbus/dbus-sysdeps-unix.h | 4 +++ | ||
25 | 3 files changed, 97 insertions(+), 13 deletions(-) | ||
26 | |||
27 | diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c | ||
28 | index 130f66e..d995240 100644 | ||
29 | --- a/dbus/dbus-server-unix.c | ||
30 | +++ b/dbus/dbus-server-unix.c | ||
31 | @@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, | ||
32 | } | ||
33 | else if (strcmp (method, "systemd") == 0) | ||
34 | { | ||
35 | - int n, *fds; | ||
36 | + int i, n, *fds; | ||
37 | DBusString address; | ||
38 | |||
39 | n = _dbus_listen_systemd_sockets (&fds, error); | ||
40 | @@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, | ||
41 | return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
42 | } | ||
43 | |||
44 | - _dbus_string_init_const (&address, "systemd:"); | ||
45 | + if (!_dbus_string_init (&address)) | ||
46 | + goto systemd_oom; | ||
47 | |||
48 | - *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); | ||
49 | - if (*server_p == NULL) | ||
50 | + for (i = 0; i < n; i++) | ||
51 | { | ||
52 | - int i; | ||
53 | - | ||
54 | - for (i = 0; i < n; i++) | ||
55 | + if (i > 0) | ||
56 | { | ||
57 | - _dbus_close_socket (fds[i], NULL); | ||
58 | + if (!_dbus_string_append (&address, ";")) | ||
59 | + goto systemd_oom; | ||
60 | } | ||
61 | - dbus_free (fds); | ||
62 | - | ||
63 | - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); | ||
64 | - return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
65 | + if (!_dbus_append_address_from_socket (fds[i], &address, error)) | ||
66 | + goto systemd_err; | ||
67 | } | ||
68 | |||
69 | + *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); | ||
70 | + if (*server_p == NULL) | ||
71 | + goto systemd_oom; | ||
72 | + | ||
73 | dbus_free (fds); | ||
74 | |||
75 | return DBUS_SERVER_LISTEN_OK; | ||
76 | - } | ||
77 | + systemd_oom: | ||
78 | + _DBUS_SET_OOM (error); | ||
79 | + systemd_err: | ||
80 | + for (i = 0; i < n; i++) | ||
81 | + { | ||
82 | + _dbus_close_socket (fds[i], NULL); | ||
83 | + } | ||
84 | + dbus_free (fds); | ||
85 | + _dbus_string_free (&address); | ||
86 | + | ||
87 | + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
88 | + } | ||
89 | #ifdef DBUS_ENABLE_LAUNCHD | ||
90 | else if (strcmp (method, "launchd") == 0) | ||
91 | { | ||
92 | diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c | ||
93 | index b4ecc96..55743b1 100644 | ||
94 | --- a/dbus/dbus-sysdeps-unix.c | ||
95 | +++ b/dbus/dbus-sysdeps-unix.c | ||
96 | @@ -55,6 +55,7 @@ | ||
97 | #include <netinet/in.h> | ||
98 | #include <netdb.h> | ||
99 | #include <grp.h> | ||
100 | +#include <arpa/inet.h> | ||
101 | |||
102 | #ifdef HAVE_ERRNO_H | ||
103 | #include <errno.h> | ||
104 | @@ -4160,4 +4161,71 @@ _dbus_check_setuid (void) | ||
105 | #endif | ||
106 | } | ||
107 | |||
108 | +/** | ||
109 | + * Read the address from the socket and append it to the string | ||
110 | + * | ||
111 | + * @param fd the socket | ||
112 | + * @param address | ||
113 | + * @param error return location for error code | ||
114 | + */ | ||
115 | +dbus_bool_t | ||
116 | +_dbus_append_address_from_socket (int fd, | ||
117 | + DBusString *address, | ||
118 | + DBusError *error) | ||
119 | +{ | ||
120 | + union { | ||
121 | + struct sockaddr sa; | ||
122 | + struct sockaddr_storage storage; | ||
123 | + struct sockaddr_un un; | ||
124 | + struct sockaddr_in ipv4; | ||
125 | + struct sockaddr_in6 ipv6; | ||
126 | + } socket; | ||
127 | + char hostip[INET6_ADDRSTRLEN]; | ||
128 | + int size = sizeof (socket); | ||
129 | + | ||
130 | + if (getsockname (fd, &socket.sa, &size)) | ||
131 | + goto err; | ||
132 | + | ||
133 | + switch (socket.sa.sa_family) | ||
134 | + { | ||
135 | + case AF_UNIX: | ||
136 | + if (socket.un.sun_path[0]=='\0') | ||
137 | + { | ||
138 | + if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1]))) | ||
139 | + return TRUE; | ||
140 | + } | ||
141 | + else | ||
142 | + { | ||
143 | + if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path)) | ||
144 | + return TRUE; | ||
145 | + } | ||
146 | + break; | ||
147 | + case AF_INET: | ||
148 | + if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip))) | ||
149 | + if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u", | ||
150 | + hostip, ntohs (socket.ipv4.sin_port))) | ||
151 | + return TRUE; | ||
152 | + break; | ||
153 | +#ifdef AF_INET6 | ||
154 | + case AF_INET6: | ||
155 | + if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip))) | ||
156 | + if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u", | ||
157 | + hostip, ntohs (socket.ipv6.sin6_port))) | ||
158 | + return TRUE; | ||
159 | + break; | ||
160 | +#endif | ||
161 | + default: | ||
162 | + dbus_set_error (error, | ||
163 | + _dbus_error_from_errno (EINVAL), | ||
164 | + "Failed to read address from socket: Unknown socket type."); | ||
165 | + return FALSE; | ||
166 | + } | ||
167 | + err: | ||
168 | + dbus_set_error (error, | ||
169 | + _dbus_error_from_errno (errno), | ||
170 | + "Failed to open socket: %s", | ||
171 | + _dbus_strerror (errno)); | ||
172 | + return FALSE; | ||
173 | +} | ||
174 | + | ||
175 | /* tests in dbus-sysdeps-util.c */ | ||
176 | diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h | ||
177 | index 9b70896..a265b33 100644 | ||
178 | --- a/dbus/dbus-sysdeps-unix.h | ||
179 | +++ b/dbus/dbus-sysdeps-unix.h | ||
180 | @@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str, | ||
181 | |||
182 | void _dbus_close_all (void); | ||
183 | |||
184 | +dbus_bool_t _dbus_append_address_from_socket (int fd, | ||
185 | + DBusString *address, | ||
186 | + DBusError *error); | ||
187 | + | ||
188 | /** @} */ | ||
189 | |||
190 | DBUS_END_DECLS | ||
191 | -- | ||
192 | 1.9.0 | ||
193 | |||
diff --git a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch b/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch deleted file mode 100644 index 96290f41be..0000000000 --- a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001 | ||
2 | From: Radoslaw Pajak <r.pajak@samsung.com> | ||
3 | Date: Fri, 8 Nov 2013 13:51:32 +0100 | ||
4 | Subject: [PATCH] fixed memory freeing if error during listing services | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com> | ||
9 | Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> | ||
10 | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526 | ||
11 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
12 | --- | ||
13 | bus/activation.c | 2 +- | ||
14 | bus/services.c | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/bus/activation.c b/bus/activation.c | ||
18 | index fcb7133..ea48a26 100644 | ||
19 | --- a/bus/activation.c | ||
20 | +++ b/bus/activation.c | ||
21 | @@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation, | ||
22 | |||
23 | error: | ||
24 | for (j = 0; j < i; j++) | ||
25 | - dbus_free (retval[i]); | ||
26 | + dbus_free (retval[j]); | ||
27 | dbus_free (retval); | ||
28 | |||
29 | return FALSE; | ||
30 | diff --git a/bus/services.c b/bus/services.c | ||
31 | index 6f380fa..01a720e 100644 | ||
32 | --- a/bus/services.c | ||
33 | +++ b/bus/services.c | ||
34 | @@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry, | ||
35 | |||
36 | error: | ||
37 | for (j = 0; j < i; j++) | ||
38 | - dbus_free (retval[i]); | ||
39 | + dbus_free (retval[j]); | ||
40 | dbus_free (retval); | ||
41 | |||
42 | return FALSE; | ||
43 | -- | ||
44 | 1.9.0 | ||
45 | |||
diff --git a/meta/recipes-core/dbus/dbus/ptest.patch b/meta/recipes-core/dbus/dbus/ptest.patch deleted file mode 100644 index 263d17eff7..0000000000 --- a/meta/recipes-core/dbus/dbus/ptest.patch +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | Add install-ptest rules. | ||
2 | Change TEST_ENVIRONMENT to allow running outside build dir. | ||
3 | |||
4 | Makefile.am | 7 +++++++ | ||
5 | bus/Makefile.am | 6 ++++++ | ||
6 | dbus/Makefile.am | 6 ++++++ | ||
7 | doc/Makefile.am | 4 ++++ | ||
8 | test/Makefile.am | 25 ++++++++++++++++++++----- | ||
9 | test/name-test/Makefile.am | 9 +++++++++ | ||
10 | tools/Makefile.am | 12 ++++++++++++ | ||
11 | 7 files changed, 64 insertions(+), 5 deletions(-) | ||
12 | |||
13 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | diff -ur a/Makefile.am b/Makefile.am | ||
17 | --- a/Makefile.am 2012-12-06 14:34:01.157414449 +0100 | ||
18 | +++ b/Makefile.am 2012-12-06 15:21:14.447113035 +0100 | ||
19 | @@ -30,4 +30,11 @@ | ||
20 | |||
21 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
22 | |||
23 | +if DBUS_BUILD_TESTS | ||
24 | +install-ptest: | ||
25 | + @for subdir in $(SUBDIRS); do \ | ||
26 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
27 | + done | ||
28 | +endif | ||
29 | + | ||
30 | include tools/lcov.am | ||
31 | diff -ur a/bus/Makefile.am b/bus/Makefile.am | ||
32 | --- a/bus/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
33 | +++ b/bus/Makefile.am 2012-12-06 15:21:14.463112346 +0100 | ||
34 | @@ -290,3 +290,9 @@ | ||
35 | #### Extra dist | ||
36 | |||
37 | EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) | ||
38 | + | ||
39 | +if DBUS_BUILD_TESTS | ||
40 | +install-ptest: | ||
41 | + @$(MKDIR_P) $(DESTDIR) | ||
42 | + @install $(dbus_daemon_exec_PROGRAMS) $(noinst_PROGRAMS) $(DESTDIR) | ||
43 | +endif | ||
44 | diff -ur a/dbus/Makefile.am b/dbus/Makefile.am | ||
45 | --- a/dbus/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
46 | +++ b/dbus/Makefile.am 2012-12-06 15:21:14.451112862 +0100 | ||
47 | @@ -310,3 +310,9 @@ | ||
48 | update-systemd: | ||
49 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c | ||
50 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h | ||
51 | + | ||
52 | +if DBUS_BUILD_TESTS | ||
53 | +install-ptest: | ||
54 | + @$(MKDIR_P) $(DESTDIR) | ||
55 | + @install $(noinst_PROGRAMS) $(DESTDIR) | ||
56 | +endif | ||
57 | diff -ur a/test/Makefile.am b/test/Makefile.am | ||
58 | --- a/test/Makefile.am 2012-12-06 14:34:01.165414103 +0100 | ||
59 | +++ b/test/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
60 | @@ -119,12 +119,13 @@ | ||
61 | DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
62 | DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) | ||
63 | |||
64 | +ptest_run_dir = .. | ||
65 | + | ||
66 | TESTS_ENVIRONMENT = \ | ||
67 | - DBUS_BLOCK_ON_ABORT=1 \ | ||
68 | - DBUS_FATAL_WARNINGS=1 \ | ||
69 | - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ | ||
70 | - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ | ||
71 | - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
72 | + DBUS_FATAL_WARNINGS=0 \ | ||
73 | + DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ | ||
74 | + DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ | ||
75 | + DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ | ||
76 | $(NULL) | ||
77 | |||
78 | test_corrupt_SOURCES = corrupt.c | ||
79 | @@ -325,3 +325,25 @@ | ||
80 | data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf | ||
81 | $(AM_V_at)$(MKDIR_P) data/valid-config-files | ||
82 | $(AM_V_GEN)cp $< $@ | ||
83 | + | ||
84 | +if DBUS_BUILD_TESTS | ||
85 | +install-ptest: install-ptest-nonrecursive | ||
86 | + @for subdir in $(SUBDIRS); do \ | ||
87 | + if [ $$subdir != "." ]; then \ | ||
88 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
89 | + fi; \ | ||
90 | + done | ||
91 | + | ||
92 | +install-ptest-nonrecursive: | ||
93 | + @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d | ||
94 | + @for file in Makefile $(installable_tests) $(noinst_PROGRAMS) $(noinst_DATA) ; do \ | ||
95 | + if [ -f .libs/$$file ]; then \ | ||
96 | + install .libs/$$file $(DESTDIR); \ | ||
97 | + else \ | ||
98 | + install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
99 | + fi; \ | ||
100 | + done; | ||
101 | + @for file in $(EXTRA_DIST); do \ | ||
102 | + install -D ${srcdir}/$${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
103 | + done; | ||
104 | +endif | ||
105 | diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am | ||
106 | --- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
107 | +++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100 | ||
108 | @@ -36,4 +36,16 @@ | ||
109 | test_privserver_client_LDADD=../libdbus-testutils.la | ||
110 | test_autolaunch_LDADD=../libdbus-testutils.la | ||
111 | |||
112 | +install-ptest: | ||
113 | + @$(MKDIR_P) $(DESTDIR) | ||
114 | + @for file in Makefile $(noinst_PROGRAMS); do \ | ||
115 | + if [ -f .libs/$$file ]; then \ | ||
116 | + install .libs/$$file $(DESTDIR); \ | ||
117 | + else \ | ||
118 | + install $$file $(DESTDIR); \ | ||
119 | + fi \ | ||
120 | + done; | ||
121 | + @for file in $(EXTRA_DIST); do \ | ||
122 | + cp $(srcdir)/$$file $(DESTDIR); \ | ||
123 | + done; | ||
124 | endif | ||
125 | diff -ur a/tools/Makefile.am b/tools/Makefile.am | ||
126 | --- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
127 | +++ b/tools/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
128 | @@ -78,3 +78,15 @@ | ||
129 | |||
130 | installcheck-local: | ||
131 | test -d $(DESTDIR)$(localstatedir)/lib/dbus | ||
132 | + | ||
133 | +if DBUS_BUILD_TESTS | ||
134 | +install-ptest: | ||
135 | + @$(MKDIR_P) $(DESTDIR) | ||
136 | + @for file in $(bin_PROGRAMS); do \ | ||
137 | + if [ -f .libs/$$file ]; then \ | ||
138 | + install .libs/$$file $(DESTDIR); \ | ||
139 | + else \ | ||
140 | + install $$file $(DESTDIR); \ | ||
141 | + fi; \ | ||
142 | + done; | ||
143 | +endif | ||
144 | diff -ur a/doc/Makefile.am b/doc/Makefile.am | ||
145 | --- a/doc/Makefile.am 2012-06-06 12:45:55.000000000 +0200 | ||
146 | +++ b/doc/Makefile.am 2012-12-06 16:04:58.990070587 +0100 | ||
147 | @@ -174,3 +174,7 @@ | ||
148 | |||
149 | maintainer-clean-local: | ||
150 | rm -f $(XMLTO_OUTPUT) | ||
151 | + | ||
152 | +if DBUS_BUILD_TESTS | ||
153 | +install-ptest: | ||
154 | +endif | ||
diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest index e08ecb1a63..c72d083a91 100755 --- a/meta/recipes-core/dbus/dbus/run-ptest +++ b/meta/recipes-core/dbus/dbus/run-ptest | |||
@@ -1,3 +1,10 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | cd test | 2 | |
3 | make -k runtest-TESTS | 3 | output() { |
4 | if [ $? -eq 0 ] | ||
5 | then echo "PASS: $i" | ||
6 | else echo "FAIL: $i" | ||
7 | fi | ||
8 | } | ||
9 | |||
10 | for i in `ls test/test-*`; do ./$i ./test/data DBUS_TEST_HOMEDIR=./test >/dev/null; output; done | ||
diff --git a/meta/recipes-core/dbus/dbus_1.6.18.bb b/meta/recipes-core/dbus/dbus_1.6.18.bb deleted file mode 100644 index 7270c36f95..0000000000 --- a/meta/recipes-core/dbus/dbus_1.6.18.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | include dbus.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "b02e9c95027a416987b81f9893831061" | ||
4 | SRC_URI[sha256sum] = "7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd" | ||
diff --git a/meta/recipes-core/dbus/dbus_1.8.2.bb b/meta/recipes-core/dbus/dbus_1.8.2.bb new file mode 100644 index 0000000000..37ebed2bd6 --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.8.2.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | include dbus.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068" | ||
4 | SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08" | ||