diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker')
2 files changed, 59 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch new file mode 100644 index 000000000..f10c49e7c --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch new file mode 100644 index 000000000..4909dea12 --- /dev/null +++ b/meta-openembedded/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 + |