[oe-commits] Andreas Müller : gdm: do not hardcode /usr/sbin

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: fb0b27dd63ee98efe8344080199602bbf39a35a6
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=fb0b27dd63ee98efe8344080199602bbf39a35a6

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Mon Sep 17 08:15:43 2012 +0000

gdm: do not hardcode /usr/sbin

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../gdm/gdm/{gdm.service => gdm.service.in}        |    2 +-
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
similarity index 81%
rename from meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
rename to meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
index 0f94e0c..3e1556a 100644
--- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
@@ -3,7 +3,7 @@ Description=Gnome Display Manager
 After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/sbin/gdm -nodaemon
+ExecStart=%sbindir%/gdm -nodaemon
 StandardOutput=syslog
 
 [Install]
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
index 496a276..45b47c3 100644
--- 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
@@ -5,9 +5,14 @@ PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
-SRC_URI += " \
-            file://gdm.service \
-           "
+SRC_URI += "file://gdm.service.in"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	sed -e 's,%sbindir%,${sbindir},g' \
+		< ${WORKDIR}/gdm.service.in \
+		> ${D}${systemd_unitdir}/system/gdm.service
+}
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE = "gdm.service"