diff options
author | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-10-13 17:13:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:29 +0000 |
commit | 883ab0f6ec0f039d78430b7289fe41e8726ea208 (patch) | |
tree | 1da7a2b865da6fff9a3dfb05c073d2487eb82311 | |
parent | 2c5047f498bc1729571566bb04b9ea90d20213c2 (diff) | |
download | poky-883ab0f6ec0f039d78430b7289fe41e8726ea208.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.
(From OE-Core rev: f5df27374b1c06280a8481325f9cf802ee5e9371)
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 3 |
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" | |||
18 | 18 | ||
19 | PE = "1" | 19 | PE = "1" |
20 | 20 | ||
21 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup qemu-native util-linux" | 21 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux" |
22 | 22 | ||
23 | SECTION = "base/shell" | 23 | SECTION = "base/shell" |
24 | 24 | ||
@@ -92,6 +92,7 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | |||
92 | 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" | 92 | 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" |
93 | PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" | 93 | PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" |
94 | PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" | 94 | PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" |
95 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" | ||
95 | 96 | ||
96 | CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" | 97 | CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" |
97 | CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" | 98 | CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" |