summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-12-30 17:11:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:50 +0000
commit0962b29d48f1bca45f5a6bb1ec47d49106c3c9d8 (patch)
tree065c9ed2a7bd98375850a82e3c3dab60098496fc /meta
parent2e8b1b47da6b77573ae6c24efd74b264cbadcb8a (diff)
downloadpoky-0962b29d48f1bca45f5a6bb1ec47d49106c3c9d8.tar.gz
libsm: remove dependency on e2fsprogs
This patch is to solve the following circular dependency problem. systemd -> dbus -> libsm -> e2fsprogs -> util-linux -> systemd libsm doesn't have any dependency on e2fsprogs. It might be some dependency on util-linux's libuuid, controlled by configure options. So e2fsprogs should be removed from the DEPENDS variable. Ideally, we should add a PACKAGECONFIG for 'libuuid' for libsm. However, if libsm depends on util-linux, we would have the circular dependency described above. That's why this patch explicitly set '--without-libuuid' in EXTRA_OECONF. libsm would still be working well because it would fall back to an internal algorithm to do the uuid stuff. (From OE-Core rev: 5e7d6f40149be69a3e3b17b28ce3f687a93b40fa) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
index 180acfae0b..1925136369 100644
--- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
@@ -11,7 +11,12 @@ require xorg-lib-common.inc
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" 12LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d"
13 13
14DEPENDS += "libice xproto xtrans e2fsprogs" 14DEPENDS += "libice xproto xtrans"
15
16# libSM can work without libuuid, we explicitly disable it to break the following circular dependency
17# when DISTRO_FEATURES contains 'systemd' and 'x11'.
18# systemd -> dbus -> libsm -> util-linux -> systemd
19EXTRA_OECONF += "--without-libuuid"
15 20
16PE = "1" 21PE = "1"
17 22