From 519d60e71767933eee082ee506b5deb2ad06fd3f Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:38 +0000 Subject: gdm: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-gnome/recipes-gnome/gdm/gdm/gdm.service | 11 ----------- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 8 ++------ meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service | 11 +++++++++++ .../meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend | 13 +++++++++++++ 4 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm.service create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend 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* \ " diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service new file mode 100644 index 0000000000..72a56f954b --- /dev/null +++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service @@ -0,0 +1,11 @@ +[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-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend new file mode 100644 index 0000000000..73083461b4 --- /dev/null +++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend @@ -0,0 +1,13 @@ +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += " \ + file://gdm.service \ + " + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "gdm.service" -- cgit v1.2.3-54-g00ecf