Patchwork [meta-oe,RFC,16/27] slim: inherit systemd / remove unneeded systemd code

login
register
mail settings
Submitter Andreas Müller
Date Feb. 7, 2012, 3:12 p.m.
Message ID <1328627573-5217-17-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/20881/
State Rejected
Headers show

Comments

Andreas Müller - Feb. 7, 2012, 3:12 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-graphics/slim/slim_1.3.2.bb |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
index 90f9939..eaec13a 100644
--- a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
+++ b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
@@ -3,7 +3,7 @@  HOMEPAGE="http://slim.berlios.de"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
@@ -26,6 +26,9 @@  SRC_URI = " \
 SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42"
 SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8"
 
+inherit systemd
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "slim.service"
 
 EXTRA_OEMAKE += " \
   USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
@@ -58,14 +61,11 @@  do_install() {
 
 
 RDEPENDS_${PN} = "perl xauth freetype sessreg "
-FILES_${PN} += "${base_libdir}/systemd/system/"
 
 pkg_postinst_${PN} () {
 if test "x$D" != "x"; then
 	exit 1
 fi
-systemctl enable slim.service
-
 # Register SLiM as default DM
 mkdir -p ${sysconfdir}/X11/
 echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
@@ -75,7 +75,6 @@  pkg_postrm_${PN} () {
 if test "x$D" != "x"; then
 	exit 1
 fi
-systemctl disable slim.service
 sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true
 }