dbus/dbus-test: upgrade to 1.12.2
cover dbus/dbus-test: upgrade to 1.12.2
The following changes since commit 4469acdf1d0338220f3fe2ecb5e079eea6fda375:
lib/oe/utils: remove param_bool() (2017-12-02 11:25:34 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/dbus-1.12.2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/dbus-1.12.2
Chen Qi (2):
dbus: upgrade to 1.12.2
dbus-test: upgrade to 1.12.2
.../{dbus-test_1.10.20.bb => dbus-test_1.12.2.bb} | 4 +--
meta/recipes-core/dbus/dbus/os-test.patch | 35 ----------------------
.../dbus/{dbus_1.10.20.bb => dbus_1.12.2.bb} | 12 ++++----
3 files changed, 9 insertions(+), 42 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.10.20.bb => dbus-test_1.12.2.bb} (93%)
delete mode 100644 meta/recipes-core/dbus/dbus/os-test.patch
rename meta/recipes-core/dbus/{dbus_1.10.20.bb => dbus_1.12.2.bb} (93%)Signature · 1 line
1.9.1
PATCH 1/2 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.
Signed-off-by Chen Qi <[email protected]>
---
meta/recipes-core/dbus/dbus/os-test.patch | 35 ----------------------
.../dbus/{dbus_1.10.20.bb => dbus_1.12.2.bb} | 12 ++++----
2 files changed, 7 insertions(+), 40 deletions(-)
delete mode 100644 meta/recipes-core/dbus/dbus/os-test.patch
rename meta/recipes-core/dbus/{dbus_1.10.20.bb => dbus_1.12.2.bb} (93%)meta/recipes-core/dbus/dbus/os-test.patch deleted +0 -35
@@ -1,35 +0,0 @@ -dbus: remove build host test in configure script - -The dbus build tests the build host to detect what initscript -environment it expects. Remove the test and set it to "redhat" -unconditionally as the oe-core initscript has a redhat-style pid file -path. - -Signed-off-by: Andy Ross <[email protected]> -Upstream-Status: Inappropriate [embedded] - -diff -u a/configure.ac b/configure.ac ---- a/configure.ac 2012-08-28 11:23:43.040609874 -0700 -+++ b/configure.ac 2012-08-28 11:54:25.602913945 -0700 -@@ -1348,19 +1348,8 @@ - AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir") - AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") - --#### Check our operating system --operating_system=unknown --if test -f /etc/redhat-release || test -f $EXPANDED_SYSCONFDIR/redhat-release ; then -- operating_system=redhat --fi -- --if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then -- operating_system=slackware --fi -- --if test -f /usr/bin/cygwin1.dll || test -f $EXPANDED_BINDIR/cygwin1.dll ; then -- operating_system=cygwin --fi -+#### Build host test removed from upstream code, openembedded initscript is redhat-like: -+operating_system=redhat - - #### Sort out init scripts -
meta/recipes-core/dbus/dbus_1.12.2.bb renamed from meta/recipes-core/dbus/dbus_1.10.20.bb +7 -5
@@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -DEPENDS = "expat virtual/libintl" +DEPENDS = "expat virtual/libintl autoconf-archive" RDEPENDS_dbus_class-native = "" RDEPENDS_dbus_class-nativesdk = "" PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
@@ -15,13 +15,12 @@ RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch \ file://dbus-1.init \ - file://os-test.patch \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ file://0001-configure.ac-explicitely-check-stdint.h.patch \ " -SRC_URI[md5sum] = "94c991e763d4f9f13690416b2dcd9411" -SRC_URI[sha256sum] = "e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48" +SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" +SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
@@ -69,12 +68,15 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${datadir}/dbus-1/session.conf \ ${datadir}/dbus-1/system.d \ ${datadir}/dbus-1/system.conf \ + ${datadir}/xml/dbus-1 \ ${systemd_system_unitdir} \ ${systemd_user_unitdir} \ + ${nonarch_libdir}/sysusers.d/dbus.conf \ + ${nonarch_libdir}/tmpfiles.d/dbus.conf \ " FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool" PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" pkg_postinst_dbus() {
Signature · 1 line
1.9.1
PATCH 2/2 dbus-test: upgrade to 1.12.2
In reply to Chen QiUpgrade dbus-test to 1.12.2 as dbus has been upgraded to this version.
Signed-off-by Chen Qi <[email protected]>
---
meta/recipes-core/dbus/{dbus-test_1.10.20.bb => dbus-test_1.12.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.10.20.bb => dbus-test_1.12.2.bb} (93%)meta/recipes-core/dbus/dbus-test_1.12.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.10.20.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "94c991e763d4f9f13690416b2dcd9411" -SRC_URI[sha256sum] = "e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48" +SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" +SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
Signature · 1 line
1.9.1