From 0289a1c325eea881ce3d68def5262f9e763d4fd2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 18 Dec 2013 16:20:04 +0000 Subject: dbus: upgrade to 1.6.18 Drop PR and INC_PR. Move patches into a non-versioned directory, and update dbus-ptest to match. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 123 ---------------- meta/recipes-core/dbus/dbus-1.6.10/os-test.patch | 35 ----- meta/recipes-core/dbus/dbus-1.6.10/ptest.patch | 154 --------------------- .../dbus/dbus-1.6.10/python-config.patch | 25 ---- meta/recipes-core/dbus/dbus-1.6.10/run-ptest | 3 - meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch | 44 ------ meta/recipes-core/dbus/dbus-ptest_1.6.10.bb | 51 ------- meta/recipes-core/dbus/dbus-ptest_1.6.18.bb | 51 +++++++ meta/recipes-core/dbus/dbus.inc | 2 - meta/recipes-core/dbus/dbus/dbus-1.init | 123 ++++++++++++++++ meta/recipes-core/dbus/dbus/os-test.patch | 35 +++++ meta/recipes-core/dbus/dbus/ptest.patch | 154 +++++++++++++++++++++ meta/recipes-core/dbus/dbus/python-config.patch | 25 ++++ meta/recipes-core/dbus/dbus/run-ptest | 3 + meta/recipes-core/dbus/dbus/tmpdir.patch | 44 ++++++ meta/recipes-core/dbus/dbus_1.6.10.bb | 6 - meta/recipes-core/dbus/dbus_1.6.18.bb | 4 + 17 files changed, 439 insertions(+), 443 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init delete mode 100644 meta/recipes-core/dbus/dbus-1.6.10/os-test.patch delete mode 100644 meta/recipes-core/dbus/dbus-1.6.10/ptest.patch delete mode 100644 meta/recipes-core/dbus/dbus-1.6.10/python-config.patch delete mode 100755 meta/recipes-core/dbus/dbus-1.6.10/run-ptest delete mode 100644 meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch delete mode 100644 meta/recipes-core/dbus/dbus-ptest_1.6.10.bb create mode 100644 meta/recipes-core/dbus/dbus-ptest_1.6.18.bb create mode 100644 meta/recipes-core/dbus/dbus/dbus-1.init create mode 100644 meta/recipes-core/dbus/dbus/os-test.patch create mode 100644 meta/recipes-core/dbus/dbus/ptest.patch create mode 100644 meta/recipes-core/dbus/dbus/python-config.patch create mode 100755 meta/recipes-core/dbus/dbus/run-ptest create mode 100644 meta/recipes-core/dbus/dbus/tmpdir.patch delete mode 100644 meta/recipes-core/dbus/dbus_1.6.10.bb create mode 100644 meta/recipes-core/dbus/dbus_1.6.18.bb diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init deleted file mode 100644 index 42c86297c3..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init +++ /dev/null @@ -1,123 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: dbus -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 1 -# Short-Description: D-Bus systemwide message bus -# Description: D-Bus is a simple interprocess messaging system, used -# for sending messages between applications. -### END INIT INFO -# -# -*- coding: utf-8 -*- -# Debian init.d script for D-BUS -# Copyright © 2003 Colin Walters - -# set -e - -# Source function library. -. /etc/init.d/functions - -DAEMON=@bindir@/dbus-daemon -NAME=dbus -DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf -PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf -UUIDDIR=/var/lib/dbus -DESC="system message bus" -EVENTDIR=/etc/dbus-1/event.d - -test -x $DAEMON || exit 0 - -# Source defaults file; edit that file to configure this script. -ENABLED=1 -PARAMS="" -if [ -e /etc/default/dbus ]; then - . /etc/default/dbus -fi - -test "$ENABLED" != "0" || exit 0 - -start_it_up() -{ - mkdir -p "`dirname $PIDFILE`" - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then - echo "$DESC already started; not starting." - else - echo "Removing stale PID file $PIDFILE." - rm -f $PIDFILE - fi - fi - - if [ ! -d $UUIDDIR ]; then - mkdir -p $UUIDDIR - chown $DAEMONUSER $UUIDDIR - chgrp $DAEMONUSER $UUIDDIR - fi - - dbus-uuidgen --ensure - - echo -n "Starting $DESC: " - start-stop-daemon -o --start --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS - echo "$NAME." - if [ -d $EVENTDIR ]; then - run-parts --arg=start $EVENTDIR - fi -} - -shut_it_down() -{ - if [ -d $EVENTDIR ]; then - # TODO: --reverse when busybox supports it - run-parts --arg=stop $EVENTDIR - fi - echo -n "Stopping $DESC: " - start-stop-daemon -o --stop --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER - # We no longer include these arguments so that start-stop-daemon - # can do its job even given that we may have been upgraded. - # We rely on the pidfile being sanely managed - # --exec $DAEMON -- --system $PARAMS - echo "$NAME." - rm -f $PIDFILE -} - -reload_it() -{ - echo -n "Reloading $DESC config: " - dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - # hopefully this is enough time for dbus to reload it's config file. - echo "done." -} - -case "$1" in - start) - start_it_up - ;; - stop) - shut_it_down - ;; - status) - status $DAEMON - exit $? - ;; - reload|force-reload) - reload_it - ;; - restart) - shut_it_down - sleep 1 - start_it_up - ;; - *) - echo "Usage: /etc/init.d/$NAME {start|stop|status|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta/recipes-core/dbus/dbus-1.6.10/os-test.patch b/meta/recipes-core/dbus/dbus-1.6.10/os-test.patch deleted file mode 100644 index 79554b1ee1..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/os-test.patch +++ /dev/null @@ -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 -Upstream-Status: innappropriate [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 - diff --git a/meta/recipes-core/dbus/dbus-1.6.10/ptest.patch b/meta/recipes-core/dbus/dbus-1.6.10/ptest.patch deleted file mode 100644 index 263d17eff7..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/ptest.patch +++ /dev/null @@ -1,154 +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 -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 +325,25 @@ - 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) $(noinst_PROGRAMS) $(noinst_DATA) ; do \ -+ if [ -f .libs/$$file ]; then \ -+ install .libs/$$file $(DESTDIR); \ -+ else \ -+ install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ -+ fi; \ -+ done; -+ @for file in $(EXTRA_DIST); do \ -+ install -D ${srcdir}/$${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,16 @@ - test_privserver_client_LDADD=../libdbus-testutils.la - test_autolaunch_LDADD=../libdbus-testutils.la - -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR) -+ @for file in Makefile $(noinst_PROGRAMS); do \ -+ if [ -f .libs/$$file ]; then \ -+ install .libs/$$file $(DESTDIR); \ -+ else \ -+ install $$file $(DESTDIR); \ -+ fi \ -+ done; -+ @for file in $(EXTRA_DIST); do \ -+ cp $(srcdir)/$$file $(DESTDIR); \ -+ 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.10/python-config.patch b/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch deleted file mode 100644 index 294400247e..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -When building the dbus-ptest package, we have to enable python. However -checking if the host-system python has the necessary library isn't useful. - -Disable the python module check for cross compiling. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Mark Hatle - ---- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 -+++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 -@@ -257,13 +257,6 @@ - # full test coverage is required, Python is a hard dependency - AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) - AM_PATH_PYTHON([2.6]) -- AC_MSG_CHECKING([for Python modules for full test coverage]) -- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) -- fi - else - # --enable-tests not given: do not abort if Python is missing - AM_PATH_PYTHON([2.6], [], [:]) diff --git a/meta/recipes-core/dbus/dbus-1.6.10/run-ptest b/meta/recipes-core/dbus/dbus-1.6.10/run-ptest deleted file mode 100755 index e08ecb1a63..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/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.10/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch deleted file mode 100644 index bf086e1788..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 23 Jun 2011 13:52:09 +0200 -Subject: [PATCH] buildsys: hardcode socketdir to /tmp - -the TMPDIR env var isn't always pointing to the right target path - -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Koen Kooi - -Original comment: - - avoid to check tmp dir at build time. instead uses hard coded /tmp here - comment added by Kevin Tian ---- - configure.ac | 11 +---------- - 1 files changed, 1 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 408054b..6d26180 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY) - AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", - [Full path to the launch helper test program in the builddir]) - --#### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+DEFAULT_SOCKET_DIR=/tmp - - DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` - --- -1.6.6.1 - diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb deleted file mode 100644 index 84ed287cb2..0000000000 --- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb +++ /dev/null @@ -1,51 +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" -RDEPENDS_${PN}-dev = "" - -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 \ - file://python-config.patch \ - " - -SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630" -SRC_URI[sha256sum] = "1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86" - -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/ \ - --with-dbus-test-dir=${PTEST_PATH} \ - ${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-ptest_1.6.18.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb new file mode 100644 index 0000000000..6dab75157a --- /dev/null +++ b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb @@ -0,0 +1,51 @@ +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" +RDEPENDS_${PN}-dev = "" + +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 \ + file://python-config.patch \ + " + +SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630" +SRC_URI[sha256sum] = "1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86" + +S="${WORKDIR}/dbus-${PV}" +FILESPATH = "${FILE_DIRNAME}/dbus" + +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/ \ + --with-dbus-test-dir=${PTEST_PATH} \ + ${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.inc b/meta/recipes-core/dbus/dbus.inc index 5b99034bf4..343079ccdf 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -13,8 +13,6 @@ RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest' RDEPENDS_dbus_class-native = "" RDEPENDS_dbus_class-nativesdk = "" -INC_PR = "r6" - SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ file://dbus-1.init \ diff --git a/meta/recipes-core/dbus/dbus/dbus-1.init b/meta/recipes-core/dbus/dbus/dbus-1.init new file mode 100644 index 0000000000..42c86297c3 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/dbus-1.init @@ -0,0 +1,123 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: dbus +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: D-Bus systemwide message bus +# Description: D-Bus is a simple interprocess messaging system, used +# for sending messages between applications. +### END INIT INFO +# +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +# set -e + +# Source function library. +. /etc/init.d/functions + +DAEMON=@bindir@/dbus-daemon +NAME=dbus +DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf +PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf +UUIDDIR=/var/lib/dbus +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + mkdir -p "`dirname $PIDFILE`" + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi + + dbus-uuidgen --ensure + + echo -n "Starting $DESC: " + start-stop-daemon -o --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it + run-parts --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon -o --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + status) + status $DAEMON + exit $? + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|status|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta/recipes-core/dbus/dbus/os-test.patch b/meta/recipes-core/dbus/dbus/os-test.patch new file mode 100644 index 0000000000..79554b1ee1 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/os-test.patch @@ -0,0 +1,35 @@ +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 +Upstream-Status: innappropriate [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 + diff --git a/meta/recipes-core/dbus/dbus/ptest.patch b/meta/recipes-core/dbus/dbus/ptest.patch new file mode 100644 index 0000000000..263d17eff7 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/ptest.patch @@ -0,0 +1,154 @@ +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 +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 +325,25 @@ + 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) $(noinst_PROGRAMS) $(noinst_DATA) ; do \ ++ if [ -f .libs/$$file ]; then \ ++ install .libs/$$file $(DESTDIR); \ ++ else \ ++ install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ ++ fi; \ ++ done; ++ @for file in $(EXTRA_DIST); do \ ++ install -D ${srcdir}/$${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,16 @@ + test_privserver_client_LDADD=../libdbus-testutils.la + test_autolaunch_LDADD=../libdbus-testutils.la + ++install-ptest: ++ @$(MKDIR_P) $(DESTDIR) ++ @for file in Makefile $(noinst_PROGRAMS); do \ ++ if [ -f .libs/$$file ]; then \ ++ install .libs/$$file $(DESTDIR); \ ++ else \ ++ install $$file $(DESTDIR); \ ++ fi \ ++ done; ++ @for file in $(EXTRA_DIST); do \ ++ cp $(srcdir)/$$file $(DESTDIR); \ ++ 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/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch new file mode 100644 index 0000000000..294400247e --- /dev/null +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -0,0 +1,25 @@ +When building the dbus-ptest package, we have to enable python. However +checking if the host-system python has the necessary library isn't useful. + +Disable the python module check for cross compiling. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mark Hatle + +--- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 ++++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 +@@ -257,13 +257,6 @@ + # full test coverage is required, Python is a hard dependency + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AM_PATH_PYTHON([2.6]) +- AC_MSG_CHECKING([for Python modules for full test coverage]) +- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) +- fi + else + # --enable-tests not given: do not abort if Python is missing + AM_PATH_PYTHON([2.6], [], [:]) diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest new file mode 100755 index 0000000000..e08ecb1a63 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh +cd test +make -k runtest-TESTS diff --git a/meta/recipes-core/dbus/dbus/tmpdir.patch b/meta/recipes-core/dbus/dbus/tmpdir.patch new file mode 100644 index 0000000000..bf086e1788 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/tmpdir.patch @@ -0,0 +1,44 @@ +From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 23 Jun 2011 13:52:09 +0200 +Subject: [PATCH] buildsys: hardcode socketdir to /tmp + +the TMPDIR env var isn't always pointing to the right target path + +Upstream-Status: Inappropriate [embedded] + +Signed-off-by: Koen Kooi + +Original comment: + + avoid to check tmp dir at build time. instead uses hard coded /tmp here + comment added by Kevin Tian +--- + configure.ac | 11 +---------- + 1 files changed, 1 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 408054b..6d26180 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY) + AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", + [Full path to the launch helper test program in the builddir]) + +-#### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++DEFAULT_SOCKET_DIR=/tmp + + DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` + +-- +1.6.6.1 + diff --git a/meta/recipes-core/dbus/dbus_1.6.10.bb b/meta/recipes-core/dbus/dbus_1.6.10.bb deleted file mode 100644 index 5b8220c8ff..0000000000 --- a/meta/recipes-core/dbus/dbus_1.6.10.bb +++ /dev/null @@ -1,6 +0,0 @@ -include dbus.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630" -SRC_URI[sha256sum] = "1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86" diff --git a/meta/recipes-core/dbus/dbus_1.6.18.bb b/meta/recipes-core/dbus/dbus_1.6.18.bb new file mode 100644 index 0000000000..7270c36f95 --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.6.18.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "b02e9c95027a416987b81f9893831061" +SRC_URI[sha256sum] = "7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd" -- cgit 1.2.3-korg