From c8a670fea52b8bd7c9a0476c82cb49bedb8b35f3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 7 Oct 2014 08:49:45 +0200 Subject: lxdm: update to latest sources and fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * /etc/lxdm/lxdm.conf was empty since out of tree build causing greeter not started * pam is now an option to configure - set it based upon distro feature * bash was added to RDEPENDS - it is required by /etc/lxdm/Xsession Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../lxdm/0002-let-autotools-create-lxdm.conf.patch | 62 ++++++++++++++++++++++ meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 24 +++++---- 2 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch (limited to 'meta-oe/recipes-graphics/lxdm') diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch new file mode 100644 index 0000000000..43f542a31d --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch @@ -0,0 +1,62 @@ +From 0ea0329f2c19a43acdc8444fa89e233ba617973d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 6 Oct 2014 13:06:24 +0200 +Subject: [PATCH] let autotools create lxdm.conf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +in out of tree builds lxdm.conf is empty + +Upstream-Status: submitted [1] + +[1] http://sourceforge.net/p/lxde/mailman/message/32901417/ + +Signed-off-by: Andreas Müller +--- + configure.ac | 1 + + data/Makefile.am | 5 ----- + data/lxdm.conf.in | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f28c89a..a2fff5b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,6 +183,7 @@ AC_CONFIG_FILES([ + data/PreReboot + data/PreShutdown + data/LoginReady ++ data/lxdm.conf + ]) + AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm]) + AC_OUTPUT +diff --git a/data/Makefile.am b/data/Makefile.am +index 9500da9..ad64b11 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,8 +1,3 @@ +-FULL_LIBEXECDIR=$(libexecdir) +- +-lxdm.conf: lxdm.conf.in +- cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ +- + NULL= + + sbin_SCRIPTS = lxdm +diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in +index d93f280..6206262 100644 +--- a/data/lxdm.conf.in ++++ b/data/lxdm.conf.in +@@ -19,7 +19,7 @@ + # skip_password=1 + + ## greeter used to welcome the user +-greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk ++greeter=@libexecdir@/lxdm-greeter-gtk + + [server] + ## arg used to start xserver, not fully function +-- +1.8.3.1 + diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index dc40fb2d3c..a3dcc1bd2f 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb @@ -5,14 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = " \ git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};branch=master \ file://lxdm.conf \ - file://lxdm-pam \ - file://lxdm-pam-debug \ + ${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + file://0002-let-autotools-create-lxdm.conf.patch \ " -LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" - -SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267" +SRCREV = "bf90ec7df5ff6745f703500c5792c344fbaef301" PV = "0.5.0+git${SRCPV}" PE = "1" @@ -29,7 +27,9 @@ S = "${WORKDIR}/git" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ - ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}" + ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ +" do_configure_prepend() { cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/ @@ -48,10 +48,12 @@ do_compile_append() { do_install_append() { install -d ${D}${localstatedir}/lib/lxdm install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm - # ArchLinux version of pam config has the following advantages: - # * simple setup of passwordless login - # * in XFCE powerdown/restart enabled in logoff dialog - install -m 644 ${WORKDIR}/${LXDM_PAM} ${D}${sysconfdir}/pam.d/lxdm + if ${@base_contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + # ArchLinux version of pam config has the following advantages: + # * simple setup of passwordless login + # * in XFCE powerdown/restart enabled in logoff dialog + install -m 644 ${WORKDIR}/${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm + fi } # make installed languages choosable @@ -68,7 +70,7 @@ done sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf } -RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" -- cgit 1.2.3-korg