aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-10-13 17:13:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:20:15 +0000
commitf5df27374b1c06280a8481325f9cf802ee5e9371 (patch)
treecc5bb18002ed5fd0abe7f2e0508d64db80e71d6f
parentf51ba9a89ee8cede03b5b7834579fd63fa483267 (diff)
downloadopenembedded-core-contrib-f5df27374b1c06280a8481325f9cf802ee5e9371.tar.gz
systemd: make dbus an optional build time dependency
The dbus buildtime dependency is only required in order to build dbus related tests in modern systemd, make this a PACKAGECONFIG option. This changes the default behaviour to no longer build dbus related tests without explicitly enabling the PACKAGECONFIG. Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd_225.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index 6936149fbd..a5909f5286 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -18,7 +18,7 @@ PROVIDES = "udev"
PE = "1"
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup qemu-native util-linux"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux"
SECTION = "base/shell"
@@ -92,6 +92,7 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind"
PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"