summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-12-08 13:03:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:57 +0000
commite9bb058e557f2aee13ea22b8d05d632b8a0495f6 (patch)
treed492f2ddef16fe74903613d6ee8d3fbe7ac21135 /meta
parent291378cd00e4a4fb7e1743c44f2696ff0eebb46f (diff)
downloadpoky-e9bb058e557f2aee13ea22b8d05d632b8a0495f6.tar.gz
dbus: upgrade to 1.12.2
1. os-test.patch is removed because current dbus has removed distro specific init script. 2. Add autoconf-archive to DEPENDS to fix do_configure failure as below. error: Unexpanded AX_ macro found. 3. Modify FILES variable to fix installed-vs-shipped QA issue. (From OE-Core rev: 3e1e783f0e18f7be1527280f39b3c74f048e24e6) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dbus/dbus/os-test.patch35
-rw-r--r--meta/recipes-core/dbus/dbus_1.12.2.bb (renamed from meta/recipes-core/dbus/dbus_1.10.20.bb)12
2 files changed, 7 insertions, 40 deletions
diff --git a/meta/recipes-core/dbus/dbus/os-test.patch b/meta/recipes-core/dbus/dbus/os-test.patch
deleted file mode 100644
index 54c257f813..0000000000
--- a/meta/recipes-core/dbus/dbus/os-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1dbus: remove build host test in configure script
2
3The dbus build tests the build host to detect what initscript
4environment it expects. Remove the test and set it to "redhat"
5unconditionally as the oe-core initscript has a redhat-style pid file
6path.
7
8Signed-off-by: Andy Ross <andy.ross@windriver.com>
9Upstream-Status: Inappropriate [embedded]
10
11diff -u a/configure.ac b/configure.ac
12--- a/configure.ac 2012-08-28 11:23:43.040609874 -0700
13+++ b/configure.ac 2012-08-28 11:54:25.602913945 -0700
14@@ -1348,19 +1348,8 @@
15 AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir")
16 AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir")
17
18-#### Check our operating system
19-operating_system=unknown
20-if test -f /etc/redhat-release || test -f $EXPANDED_SYSCONFDIR/redhat-release ; then
21- operating_system=redhat
22-fi
23-
24-if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then
25- operating_system=slackware
26-fi
27-
28-if test -f /usr/bin/cygwin1.dll || test -f $EXPANDED_BINDIR/cygwin1.dll ; then
29- operating_system=cygwin
30-fi
31+#### Build host test removed from upstream code, openembedded initscript is redhat-like:
32+operating_system=redhat
33
34 #### Sort out init scripts
35
diff --git a/meta/recipes-core/dbus/dbus_1.10.20.bb b/meta/recipes-core/dbus/dbus_1.12.2.bb
index 9ddedc15fe..d923d33558 100644
--- a/meta/recipes-core/dbus/dbus_1.10.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.2.bb
@@ -5,7 +5,7 @@ SECTION = "base"
5LICENSE = "AFL-2 | GPLv2+" 5LICENSE = "AFL-2 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8DEPENDS = "expat virtual/libintl" 8DEPENDS = "expat virtual/libintl autoconf-archive"
9RDEPENDS_dbus_class-native = "" 9RDEPENDS_dbus_class-native = ""
10RDEPENDS_dbus_class-nativesdk = "" 10RDEPENDS_dbus_class-nativesdk = ""
11PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" 11PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
@@ -15,13 +15,12 @@ RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
16 file://tmpdir.patch \ 16 file://tmpdir.patch \
17 file://dbus-1.init \ 17 file://dbus-1.init \
18 file://os-test.patch \
19 file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ 18 file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
20 file://0001-configure.ac-explicitely-check-stdint.h.patch \ 19 file://0001-configure.ac-explicitely-check-stdint.h.patch \
21" 20"
22 21
23SRC_URI[md5sum] = "94c991e763d4f9f13690416b2dcd9411" 22SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254"
24SRC_URI[sha256sum] = "e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48" 23SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88"
25 24
26inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even 25inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
27 26
@@ -69,12 +68,15 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
69 ${datadir}/dbus-1/session.conf \ 68 ${datadir}/dbus-1/session.conf \
70 ${datadir}/dbus-1/system.d \ 69 ${datadir}/dbus-1/system.d \
71 ${datadir}/dbus-1/system.conf \ 70 ${datadir}/dbus-1/system.conf \
71 ${datadir}/xml/dbus-1 \
72 ${systemd_system_unitdir} \ 72 ${systemd_system_unitdir} \
73 ${systemd_user_unitdir} \ 73 ${systemd_user_unitdir} \
74 ${nonarch_libdir}/sysusers.d/dbus.conf \
75 ${nonarch_libdir}/tmpfiles.d/dbus.conf \
74" 76"
75FILES_${PN}-lib = "${libdir}/lib*.so.*" 77FILES_${PN}-lib = "${libdir}/lib*.so.*"
76RRECOMMENDS_${PN}-lib = "${PN}" 78RRECOMMENDS_${PN}-lib = "${PN}"
77FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool" 79FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool"
78 80
79PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" 81PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}"
80pkg_postinst_dbus() { 82pkg_postinst_dbus() {