Patchwork [meta-oe,RFC,13/27] gdm: 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-14-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/20843/
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-gnome/recipes-gnome/gdm/gdm_2.32.2.bb |   32 ++++-----------------------
 1 files changed, 5 insertions(+), 27 deletions(-)

Patch

diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 9be65b3..fd6eee3 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,9 +4,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
 
-PR = "r5"
+PR = "r6"
 
-inherit gnome update-rc.d
+inherit gnome update-rc.d systemd
 
 SRC_URI += " \
             file://cross-xdetection.diff \
@@ -45,31 +45,6 @@  do_install_append() {
 
 	install -d ${D}/${sysconfdir}/gdm/Init
 	install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
-
-	install -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/gdm.service ${D}${base_libdir}/systemd/system/ 
-}
-
-PACKAGES =+ "gdm-systemd"
-FILES_gdm-systemd = "${base_libdir}/systemd"
-RDEPENDS_gdm-systemd = "gdm"
-
-pkg_postinst_gdm-systemd() {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-	
-	systemctl enable gdm.service
-}
-
-pkg_postrm_gdm-systemd() {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-
-	systemctl disable gdm.service
 }
 
 FILES_${PN} += "${datadir}/icon* \
@@ -84,6 +59,9 @@  RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gn
 INITSCRIPT_NAME = "gdm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "gdm.service"
+
 pkg_postinst_${PN} () {
     # can't do this offline
     if [ "x$D" != "x" ]; then