gdm: move systemd support from meta-systemd back to meta-gnome

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 21 insertions, 6 deletions

diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
new file mode 100644
index 000000000..3e1556ae0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Gnome Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=%sbindir%/gdm -nodaemon
+StandardOutput=syslog
+
+[Install]
+Alias=display-manager.service
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 863db2e87..45bddc8f0 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 = "r10"
+PR = "r15"
 
-inherit gnome update-rc.d
+inherit gnome update-rc.d systemd
 
 SRC_URI += " \
             file://cross-xdetection.diff \
@@ -17,6 +17,7 @@ SRC_URI += " \
             file://gdm.conf \
             file://gdm-pam \
             file://Default \
+            file://gdm.service.in \
            "
 
 SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@@ -49,6 +50,10 @@ do_install_append() {
         install -d ${D}/${sysconfdir}/gdm/Init
         install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
 
+        install -d ${D}${systemd_unitdir}/system
+        sed -e 's,%sbindir%,${sbindir},g' \
+                < ${WORKDIR}/gdm.service.in \
+                > ${D}${systemd_unitdir}/system/gdm.service
 }
 
 FILES_${PN} += "${datadir}/icon* \
@@ -60,6 +65,10 @@ RDEPENDS_${PN} += "grep dbus-x11 shadow"
 CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
 RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
 
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
+
 INITSCRIPT_NAME = "gdm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
@@ -87,7 +96,3 @@ pkg_postrm_${PN} () {
     delgroup gdm || true
         sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
 }
-
-
-
-