summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gdm
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 13:32:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:02 +0200
commit0638208514d04557894f43213e2b5d5cf60f0a16 (patch)
tree1ad49c36f3604bc8c701aabef8b7415ace34b360 /meta-gnome/recipes-gnome/gdm
parent48442f26214e67567321e9091f2c43f745cfe980 (diff)
downloadmeta-openembedded-0638208514d04557894f43213e2b5d5cf60f0a16.tar.gz
gdm: move systemd support from meta-systemd back to meta-gnome
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gdm')
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in10
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb17
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 @@
1[Unit]
2Description=Gnome Display Manager
3After=systemd-user-sessions.service
4
5[Service]
6ExecStart=%sbindir%/gdm -nodaemon
7StandardOutput=syslog
8
9[Install]
10Alias=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"
4 4
5DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" 5DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
6 6
7PR = "r10" 7PR = "r15"
8 8
9inherit gnome update-rc.d 9inherit gnome update-rc.d systemd
10 10
11SRC_URI += " \ 11SRC_URI += " \
12 file://cross-xdetection.diff \ 12 file://cross-xdetection.diff \
@@ -17,6 +17,7 @@ SRC_URI += " \
17 file://gdm.conf \ 17 file://gdm.conf \
18 file://gdm-pam \ 18 file://gdm-pam \
19 file://Default \ 19 file://Default \
20 file://gdm.service.in \
20 " 21 "
21 22
22SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" 23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@@ -49,6 +50,10 @@ do_install_append() {
49 install -d ${D}/${sysconfdir}/gdm/Init 50 install -d ${D}/${sysconfdir}/gdm/Init
50 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init 51 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
51 52
53 install -d ${D}${systemd_unitdir}/system
54 sed -e 's,%sbindir%,${sbindir},g' \
55 < ${WORKDIR}/gdm.service.in \
56 > ${D}${systemd_unitdir}/system/gdm.service
52} 57}
53 58
54FILES_${PN} += "${datadir}/icon* \ 59FILES_${PN} += "${datadir}/icon* \
@@ -60,6 +65,10 @@ RDEPENDS_${PN} += "grep dbus-x11 shadow"
60CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" 65CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
61RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit" 66RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
62 67
68RREPLACES_${PN} += "${PN}-systemd"
69RCONFLICTS_${PN} += "${PN}-systemd"
70SYSTEMD_SERVICE_${PN} = "gdm.service"
71
63INITSCRIPT_NAME = "gdm" 72INITSCRIPT_NAME = "gdm"
64INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." 73INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
65 74
@@ -87,7 +96,3 @@ pkg_postrm_${PN} () {
87 delgroup gdm || true 96 delgroup gdm || true
88 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true 97 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
89} 98}
90
91
92
93