summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-06-10 21:46:38 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:05 +0200
commit519d60e71767933eee082ee506b5deb2ad06fd3f (patch)
tree2e595944ac0d5c939dff52a8c1b2683c3b744e5c /meta-gnome
parentfb56d13c70822d3438fd22f15f2ba69345598483 (diff)
downloadmeta-openembedded-519d60e71767933eee082ee506b5deb2ad06fd3f.tar.gz
gdm: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm/gdm.service11
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb8
2 files changed, 2 insertions, 17 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
deleted file mode 100644
index 72a56f954..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
+++ /dev/null
@@ -1,11 +0,0 @@
1[Unit]
2Description=Gnome Display Manager
3Requires=dev-tty7.device
4After=dev-tty7.device systemd-user-sessions.service
5
6[Service]
7ExecStart=/usr/sbin/gdm -nodaemon
8StandardOutput=syslog
9
10[Install]
11WantedBy=graphical.target
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 6ebd58742..bdf249e94 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 = "r8" 7PR = "r9"
8 8
9inherit gnome update-rc.d systemd 9inherit gnome update-rc.d
10 10
11SRC_URI += " \ 11SRC_URI += " \
12 file://cross-xdetection.diff \ 12 file://cross-xdetection.diff \
@@ -17,7 +17,6 @@ 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 \
21 " 20 "
22 21
23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" 22SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@@ -48,9 +47,6 @@ do_install_append() {
48 47
49} 48}
50 49
51SYSTEMD_PACKAGES = "${PN}-systemd"
52SYSTEMD_SERVICE = "gdm.service"
53
54FILES_${PN} += "${datadir}/icon* \ 50FILES_${PN} += "${datadir}/icon* \
55 ${datadir}/xsession* \ 51 ${datadir}/xsession* \
56 " 52 "