diff options
author | Yang Lyu <yang.lyu@axis.com> | 2018-03-21 12:40:54 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:40:56 -0700 |
commit | ed70b4f91f5fd6776f120cd5c9f915a8b999adfd (patch) | |
tree | 3329907a23ec3d062b8743ca30215228339b1f2b /meta-oe/recipes-core | |
parent | fa1913215275899b09c49c0bb5531f26909c5790 (diff) | |
download | meta-openembedded-contrib-ed70b4f91f5fd6776f120cd5c9f915a8b999adfd.tar.gz |
dbus-broker: Add recipe
DBus-broker is a drop-in replacement for dbus-daemon. It is an implementation of a message
bus as defined by the D-Bus specification. Its aim is to provide high performance and
reliability, while keeping compatibility to the D-Bus reference implementation.
0001-Comment-rst2man-related-stuff.patch avoids using rst2man.
0002-Correct-including-directory-for-conf.patch fixs path computation for <include> node.
The patch should be dropped when a newer version of dbus-broker that includes commit:
https://github.com/bus1/dbus-broker/commit/9af79016f0f6b1ee60779bc6dc4acd7b4b9e6c70
is available.
Signed-off-by: Yang Lyu <yang.lyu@axis.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
3 files changed, 88 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch b/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch new file mode 100644 index 00000000000..f10c49e7c3a --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch @@ -0,0 +1,34 @@ +From a92fd7da3a262e21c0970a3908eb0b4502819a01 Mon Sep 17 00:00:00 2001 +From: Yang Lyu <yangl@axis.com> +Date: Fri, 23 Feb 2018 16:31:49 +0100 +Subject: [PATCH] Comment rst2man related stuff + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 56d38e4..3c3b109 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,7 +15,7 @@ add_project_arguments('-DBINDIR="' + join_paths(get_option('prefix'), get_option + cc = meson.get_compiler('c') + conf = configuration_data() + mod_pkgconfig = import('pkgconfig') +-prog_rst2man = find_program('rst2man', 'rst2man.py') ++#prog_rst2man = find_program('rst2man', 'rst2man.py') + + sub_cdvar = subproject('c-dvar', version: '>=1') + sub_clist = subproject('c-list', version: '>=3') +@@ -56,7 +56,7 @@ endif + + conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) + +-subdir('docs') ++#subdir('docs') + subdir('src') + + if use_launcher +-- +2.1.4 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch b/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch new file mode 100644 index 00000000000..4909dea1257 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch @@ -0,0 +1,25 @@ +From 4b79f603b948709906c108796087de7b5643f61a Mon Sep 17 00:00:00 2001 +From: Yang Lyu <yangl@axis.com> +Date: Mon, 26 Feb 2018 12:48:34 +0100 +Subject: [PATCH] Correct including directory for conf + +--- + src/launch/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/launch/config.c b/src/launch/config.c +index 6a68699..579471b 100644 +--- a/src/launch/config.c ++++ b/src/launch/config.c +@@ -1022,7 +1022,7 @@ static void config_parser_end_fn(void *userdata, const XML_Char *name) { + state->file, + state->current->include.selinux_root_relative ? + bus_selinux_policy_root() : +- state->file->path, ++ NULL, + state->current->cdata); + if (r) { + state->error = error_trace(r); +-- +2.1.4 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_git.bb new file mode 100644 index 00000000000..51dfe8c0a26 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +DEPENDS = "dbus glib-2.0 expat systemd" + +PV = "9+git${SRCPV}" +SRCREV = "ccd06b284892182af569e69046262331150e3536" + +SRC_URI = "git://github.com/bus1/dbus-broker;protocol=git" +SRC_URI += "file://0001-Comment-rst2man-related-stuff.patch" +SRC_URI += "file://0002-Correct-including-directory-for-conf.patch" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" + +RDEPENDS_${PN} = "dbus systemd" + +BBCLASSEXTEND = "native" |