diff options
author | stephen.arnold42 <stephen.arnold42@gmail.com> | 2014-03-18 02:09:08 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-23 21:53:58 +0100 |
commit | 7dfa6be8c5d9b093ae79c403c685c6b8ed6216dd (patch) | |
tree | 881a613b4a27a255714f4f3a44b4aad00e74f7f6 | |
parent | b306212c8919a8638d5e97acfd6262bcbd3401ed (diff) | |
download | meta-openembedded-7dfa6be8c5d9b093ae79c403c685c6b8ed6216dd.tar.gz |
recipes-graphics/lxdm: autotools and config updates
lxdm_git.bb: Upstream changes required autotools and gettext (intl) updates;
the package autogen script doesn't create the makefile in po, but autotools
by itself is missing the input file (thus, the configure_prepend). There
were also missing depends (from upstream docs and configure checks) and
some configure options were added to ensure the desired X/gtk2 config and
enable (optional) auto-login.
Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index c12eddf23..c602ad381 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb | |||
@@ -16,17 +16,24 @@ SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267" | |||
16 | PV = "0.5.0+git${SRCPV}" | 16 | PV = "0.5.0+git${SRCPV}" |
17 | PE = "1" | 17 | PE = "1" |
18 | 18 | ||
19 | DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" | 19 | DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" |
20 | DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" | 20 | DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" |
21 | 21 | ||
22 | # combine oe-core way with angstrom DISTRO_TYPE | 22 | # combine oe-core way with angstrom DISTRO_TYPE |
23 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | 23 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" |
24 | 24 | ||
25 | inherit autotools gettext systemd | 25 | inherit autotools pkgconfig gettext systemd |
26 | 26 | ||
27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
28 | 28 | ||
29 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}" | 29 | CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " |
30 | |||
31 | EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ | ||
32 | ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}" | ||
33 | |||
34 | do_configure_prepend() { | ||
35 | cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/ | ||
36 | } | ||
30 | 37 | ||
31 | do_compile_append() { | 38 | do_compile_append() { |
32 | # default background configured not available / no password field available / no default screensaver | 39 | # default background configured not available / no password field available / no default screensaver |