From patchwork Fri Jul 13 08:30:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [meta-oe,V2,10/32] gdm: move systemd support to meta-systemd Date: Fri, 13 Jul 2012 08:30:18 -0000 From: =?utf-8?q?Andreas_M=C3=BCller_=3Cschnitzeltony=40googlemail=2Ecom=3E?= X-Patchwork-Id: 31863 Message-Id: <1342168240-7760-11-git-send-email-schnitzeltony@googlemail.com> To: openembedded-devel@lists.openembedded.org Signed-off-by: Andreas Müller --- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 8 ++------ .../meta-gnome}/recipes-gnome/gdm/gdm/gdm.service | 0 .../recipes-gnome/gdm/gdm_2.32.2.bbappend | 13 +++++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) rename {meta-gnome => meta-systemd/meta-gnome}/recipes-gnome/gdm/gdm/gdm.service (100%) create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend 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 6ebd587..bdf249e 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-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service similarity index 100% rename from meta-gnome/recipes-gnome/gdm/gdm/gdm.service rename to meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service 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 0000000..7308346 --- /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"