summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb8
-rw-r--r--meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service (renamed from meta-gnome/recipes-gnome/gdm/gdm/gdm.service)0
-rw-r--r--meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend13
3 files changed, 15 insertions, 6 deletions
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"
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 "
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
index 72a56f954b..72a56f954b 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
+++ b/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 0000000000..73083461b4
--- /dev/null
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
@@ -0,0 +1,13 @@
1# look for files in the layer first
2FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3
4PRINC := "${@int(PRINC) + 1}"
5
6inherit systemd
7
8SRC_URI += " \
9 file://gdm.service \
10 "
11
12SYSTEMD_PACKAGES = "${PN}-systemd"
13SYSTEMD_SERVICE = "gdm.service"