Patchwork lxdm: initial add 1.22_git

login
mail settings
Submitter Andreas Müller
Date Sept. 3, 2012, 4:43 p.m.
Message ID <1346690580-26040-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/35737/
State Superseded
Headers show

Comments

Andreas Müller - Sept. 3, 2012, 4:43 p.m.
* 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>
---
 ...conf.in-blacklist-root-for-release-images.patch |   29 +++++++++++
 ...001-pam-use-common-instead-of-system-auth.patch |   35 +++++++++++++
 meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf       |    4 ++
 meta-oe/recipes-graphics/lxdm/lxdm_git.bb          |   51 ++++++++++++++++++++
 .../recipes-graphics/lxdm/lxdm/lxdm.service.in     |   10 ++++
 .../recipes-graphics/lxdm/lxdm_git.bbappend        |   16 ++++++
 6 files changed, 145 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
 create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
 create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
 create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm_git.bb
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
Andreas Müller - Sept. 12, 2012, 12:30 p.m.
On Mon, Sep 3, 2012 at 6:43 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> * 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>
> ---
>  ...conf.in-blacklist-root-for-release-images.patch |   29 +++++++++++
>  ...001-pam-use-common-instead-of-system-auth.patch |   35 +++++++++++++
>  meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf       |    4 ++
>  meta-oe/recipes-graphics/lxdm/lxdm_git.bb          |   51 ++++++++++++++++++++
>  .../recipes-graphics/lxdm/lxdm/lxdm.service.in     |   10 ++++
>  .../recipes-graphics/lxdm/lxdm_git.bbappend        |   16 ++++++
>  6 files changed, 145 insertions(+), 0 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
>  create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
>  create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
>  create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm_git.bb
>  create mode 100644 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
>  create mode 100644 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
>
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
> new file mode 100644
> index 0000000..49ecdb8
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
> @@ -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
> +
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
> new file mode 100644
> index 0000000..b128928
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
> @@ -0,0 +1,35 @@
> +From 1e40c03c44de9d985c40f103ec3d4e5251d26cb2 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Wed, 20 Jun 2012 11:51:28 +0200
> +Subject: [PATCH] pam: use common-* instead of system-auth
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +Inappropriate [build system specific change]
> +
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + pam/lxdm |    6 +++---
> + 1 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/pam/lxdm b/pam/lxdm
> +index cffd07b..3e49fc5 100644
> +--- a/pam/lxdm
> ++++ b/pam/lxdm
> +@@ -1,9 +1,9 @@
> + #%PAM-1.0
> +-auth       substack   system-auth
> ++auth       substack   common-auth
> + auth       optional   pam_gnome_keyring.so
> +-account    include    system-auth
> ++account    include    common-account
> + session    optional   pam_keyinit.so force revoke
> +-session    include    system-auth
> ++session    include    common-session
> + session    required   pam_loginuid.so
> + session    optional   pam_console.so
> + session    optional   pam_gnome_keyring.so auto_start
> +--
> +1.7.6.5
> +
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf b/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
> new file mode 100644
> index 0000000..0a6e672
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
> @@ -0,0 +1,4 @@
> +[base]
> +last_session=
> +last_lang=
> +last_langs=
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> new file mode 100644
> index 0000000..a7261fd
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> @@ -0,0 +1,51 @@
> +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://0001-pam-use-common-instead-of-system-auth.patch \
> +       ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
> +       file://lxdm.conf \
> +"
> +
> +SRCREV = "4f9ec27acc7f1f92b20a6ec64a50ac86aa7a5fc6"
> +PV = "0.4.2+git${SRCPV}"
> +
> +DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
> +
> +DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
> +
> +inherit autotools gettext
> +
> +S = "${WORKDIR}/git"
> +
> +do_compile_append() {
> +       # default background configured not available
> +       sed -i -e 's,bg=,# bg=,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
> +}
> +
> +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"
> diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
> new file mode 100644
> index 0000000..0bc6774
> --- /dev/null
> +++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
> @@ -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
> diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
> new file mode 100644
> index 0000000..e4cf44d
> --- /dev/null
> +++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
> @@ -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"
> --
> 1.7.4.4
>
ping

Patch

diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
new file mode 100644
index 0000000..49ecdb8
--- /dev/null
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
@@ -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
+
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
new file mode 100644
index 0000000..b128928
--- /dev/null
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-pam-use-common-instead-of-system-auth.patch
@@ -0,0 +1,35 @@ 
+From 1e40c03c44de9d985c40f103ec3d4e5251d26cb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 20 Jun 2012 11:51:28 +0200
+Subject: [PATCH] pam: use common-* instead of system-auth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Inappropriate [build system specific change]
+
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ pam/lxdm |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pam/lxdm b/pam/lxdm
+index cffd07b..3e49fc5 100644
+--- a/pam/lxdm
++++ b/pam/lxdm
+@@ -1,9 +1,9 @@
+ #%PAM-1.0
+-auth       substack	system-auth
++auth       substack	common-auth
+ auth       optional	pam_gnome_keyring.so
+-account    include	system-auth
++account    include	common-account
+ session    optional	pam_keyinit.so force revoke
+-session    include	system-auth
++session    include	common-session
+ session    required	pam_loginuid.so
+ session    optional	pam_console.so
+ session    optional	pam_gnome_keyring.so auto_start
+-- 
+1.7.6.5
+
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf b/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
new file mode 100644
index 0000000..0a6e672
--- /dev/null
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
@@ -0,0 +1,4 @@ 
+[base]
+last_session=
+last_lang=
+last_langs=
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
new file mode 100644
index 0000000..a7261fd
--- /dev/null
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -0,0 +1,51 @@ 
+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://0001-pam-use-common-instead-of-system-auth.patch \
+	${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
+	file://lxdm.conf \
+"
+
+SRCREV = "4f9ec27acc7f1f92b20a6ec64a50ac86aa7a5fc6"
+PV = "0.4.2+git${SRCPV}"
+
+DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
+
+DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
+
+inherit autotools gettext
+
+S = "${WORKDIR}/git"
+
+do_compile_append() {
+	# default background configured not available
+	sed -i -e 's,bg=,# bg=,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
+}
+
+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"
diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
new file mode 100644
index 0000000..0bc6774
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
@@ -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
diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
new file mode 100644
index 0000000..e4cf44d
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
@@ -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"