diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-06-07 15:27:01 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:28:00 +0200 |
commit | d56cac1bf1ae77479d7bb5803c948ffd9da12e44 (patch) | |
tree | 72b32291b91fa87f26e56b461803cc9edf6d5765 /meta-oe/recipes-graphics/lxdm/lxdm_git.bb | |
parent | 010f75a8d052251fee1bb2d42f926693fade962c (diff) | |
download | meta-openembedded-contrib-d56cac1bf1ae77479d7bb5803c948ffd9da12e44.tar.gz |
lxdm: remove consolekit dependencies in systemd environment and fix build
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/lxdm/lxdm_git.bb')
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index 6675691e60..8767e98fc7 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb @@ -8,6 +8,7 @@ SRC_URI = " \ file://lxdm-pam \ file://lxdm-pam-debug \ ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \ " LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" @@ -17,7 +18,8 @@ PV = "0.4.2+git${SRCPV}" PE = "1" PR = "r7" -DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" +DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" +DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" @@ -26,7 +28,7 @@ inherit autotools gettext systemd S = "${WORKDIR}/git" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}" do_compile_append() { # default background configured not available / no password field available / no default screensaver |