mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
lxdm: initial add 1.22_git
* use git version since 1.21 missing escape button and bugfixes * no init-scripts (I am working with systemd -> testing causes huge efforts -> subsequent patches) * run tested on overo/xfce Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller
committed by
Koen Kooi
Koen Kooi
parent
72335a05f2
commit
4d234731b2
+29
@@ -0,0 +1,29 @@
|
||||
From 5038c49c0b61e057dec44c932f02c4bf99cee96e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 3 Sep 2012 10:02:51 +0200
|
||||
Subject: [PATCH] lxdm.conf.in: blacklist root for release images
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
data/lxdm.conf.in | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
|
||||
index defc082..759e6e5 100644
|
||||
--- a/data/lxdm.conf.in
|
||||
+++ b/data/lxdm.conf.in
|
||||
@@ -58,5 +58,5 @@ disable=0
|
||||
white=
|
||||
|
||||
## blacklist user
|
||||
-black=
|
||||
+black=root
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
#%PAM-1.0
|
||||
# taken from http://aur.archlinux.org/packages/lx/lxdm-git/lxdm-git.tar.gz
|
||||
# further info https://wiki.archlinux.org/index.php/LXDM
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
auth required pam_unix.so
|
||||
# To allow passwordless login comment previous line and uncomment next line
|
||||
#auth required pam_unix.so nullok
|
||||
account required pam_unix.so
|
||||
session required pam_limits.so
|
||||
session required pam_unix.so
|
||||
password required pam_unix.so
|
||||
-session optional pam_systemd.so
|
||||
@@ -0,0 +1,13 @@
|
||||
#%PAM-1.0
|
||||
# taken from http://aur.archlinux.org/packages/lx/lxdm-git/lxdm-git.tar.gz
|
||||
# further info https://wiki.archlinux.org/index.php/LXDM
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
#auth required pam_unix.so
|
||||
# To deny passwordless login comment next line and uncomment previous line
|
||||
auth required pam_unix.so nullok
|
||||
account required pam_unix.so
|
||||
session required pam_limits.so
|
||||
session required pam_unix.so
|
||||
password required pam_unix.so
|
||||
-session optional pam_systemd.so
|
||||
@@ -0,0 +1,4 @@
|
||||
[base]
|
||||
last_session=
|
||||
last_lang=
|
||||
last_langs=
|
||||
@@ -0,0 +1,62 @@
|
||||
DESCRIPTION = "LXDM is the lightweight display manager"
|
||||
HOMEPAGE = "http://blog.lxde.org/?p=531"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
SRC_URI = " \
|
||||
git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};protocol=git;branch=master \
|
||||
file://lxdm.conf \
|
||||
file://lxdm-pam \
|
||||
file://lxdm-pam-debug \
|
||||
${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
|
||||
"
|
||||
|
||||
LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}"
|
||||
|
||||
SRCREV = "d681bc90b62ec2e13ed62fc30cdaf5dbbba23cdc"
|
||||
PV = "0.4.2+git${SRCPV}"
|
||||
|
||||
DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
|
||||
|
||||
# combine oe-core way with angstrom DISTRO_TYPE
|
||||
DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_compile_append() {
|
||||
# default background configured not available / no password field available
|
||||
sed -i -e 's,bg=,# bg=,g' \
|
||||
-e 's,# skip_password=,skip_password=,g' \
|
||||
${S}/data/lxdm.conf.in
|
||||
# add default configuration
|
||||
oe_runmake -C ${S}/data lxdm.conf
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
# make installed languages choosable
|
||||
pkg_postinst_${PN} () {
|
||||
if [ "x$D" != "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
langs=""
|
||||
for lang in `find ${libdir}/locale -maxdepth 1 | grep _ | sort`; do
|
||||
lang=`basename $lang`
|
||||
if [ "x$langs" = "x" ]; then
|
||||
langs="$lang"
|
||||
else
|
||||
langs="$langs $lang"
|
||||
fi
|
||||
done
|
||||
sed -i "s:last_langs=.*$:last_langs=$langs:g" ${localstatedir}/lib/lxdm/lxdm.conf
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} = "pam-plugin-loginuid"
|
||||
@@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=LXDE Display Manager
|
||||
After=systemd-user-sessions.service
|
||||
|
||||
[Service]
|
||||
ExecStart=%sbindir%/lxdm
|
||||
StandardOutput=syslog
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@@ -0,0 +1,16 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
SRC_URI += "file://lxdm.service.in"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
sed -e 's,%sbindir%,${sbindir},g' \
|
||||
< ${WORKDIR}/lxdm.service.in \
|
||||
> ${D}${systemd_unitdir}/system/lxdm.service
|
||||
}
|
||||
|
||||
SYSTEMD_PACKAGES = "${PN}-systemd"
|
||||
SYSTEMD_SERVICE = "lxdm.service"
|
||||
Reference in New Issue
Block a user