diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:38 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:05 +0200 |
| commit | 519d60e71767933eee082ee506b5deb2ad06fd3f (patch) | |
| tree | 2e595944ac0d5c939dff52a8c1b2683c3b744e5c /meta-gnome | |
| parent | fb56d13c70822d3438fd22f15f2ba69345598483 (diff) | |
| download | meta-openembedded-contrib-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.service | 11 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 8 |
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 72a56f954b..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Gnome Display Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/gdm -nodaemon -StandardOutput=syslog - -[Install] -WantedBy=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 6ebd587426..bdf249e941 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 = "r8" +PR = "r9" -inherit gnome update-rc.d systemd +inherit gnome update-rc.d SRC_URI += " \ file://cross-xdetection.diff \ @@ -17,7 +17,6 @@ SRC_URI += " \ file://gdm.conf \ file://gdm-pam \ file://Default \ - file://gdm.service \ " SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" @@ -48,9 +47,6 @@ do_install_append() { } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "gdm.service" - FILES_${PN} += "${datadir}/icon* \ ${datadir}/xsession* \ " |