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 | |
parent | 010f75a8d052251fee1bb2d42f926693fade962c (diff) | |
download | meta-openembedded-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')
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch | 48 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 6 |
2 files changed, 52 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch new file mode 100644 index 000000000..e2ba52a8c --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 7 Jun 2013 14:13:41 +0200 | ||
4 | Subject: [PATCH] configure: check only for ck-connector in case consolekit is | ||
5 | enabled | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | it failed for --disable-consolekit with | ||
11 | |||
12 | | lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory | ||
13 | | compilation terminated. | ||
14 | | make[2]: *** [lxdm_binary-lxdm.o] Error 1 | ||
15 | |||
16 | Upstream-Status: submitted [1] | ||
17 | |||
18 | [1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893 | ||
19 | |||
20 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
21 | --- | ||
22 | configure.ac | 3 +-- | ||
23 | 1 files changed, 1 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/configure.ac b/configure.ac | ||
26 | index 9e21a22..49ba944 100644 | ||
27 | --- a/configure.ac | ||
28 | +++ b/configure.ac | ||
29 | @@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then | ||
30 | fi]) | ||
31 | fi | ||
32 | |||
33 | -AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) | ||
34 | - | ||
35 | # Checks for header files. | ||
36 | AC_PATH_X | ||
37 | AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) | ||
38 | @@ -102,6 +100,7 @@ if test "x$enable_consolekit" = "xyes" ; then | ||
39 | AC_SUBST(CONSOLEKIT_LIBS)],[ | ||
40 | echo "ConsoleKit devel package not found" | ||
41 | ]) | ||
42 | + AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) | ||
43 | fi | ||
44 | |||
45 | |||
46 | -- | ||
47 | 1.7.6.5 | ||
48 | |||
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index 6675691e6..8767e98fc 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 = " \ | |||
8 | file://lxdm-pam \ | 8 | file://lxdm-pam \ |
9 | file://lxdm-pam-debug \ | 9 | file://lxdm-pam-debug \ |
10 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ | 10 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ |
11 | file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" | 14 | LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" |
@@ -17,7 +18,8 @@ PV = "0.4.2+git${SRCPV}" | |||
17 | PE = "1" | 18 | PE = "1" |
18 | PR = "r7" | 19 | PR = "r7" |
19 | 20 | ||
20 | DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" | 21 | DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" |
22 | DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" | ||
21 | 23 | ||
22 | # combine oe-core way with angstrom DISTRO_TYPE | 24 | # combine oe-core way with angstrom DISTRO_TYPE |
23 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | 25 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" |
@@ -26,7 +28,7 @@ inherit autotools gettext systemd | |||
26 | 28 | ||
27 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
28 | 30 | ||
29 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | 31 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}" |
30 | 32 | ||
31 | do_compile_append() { | 33 | do_compile_append() { |
32 | # default background configured not available / no password field available / no default screensaver | 34 | # default background configured not available / no password field available / no default screensaver |