Patchwork [45/58] entrance: rename xserver-nodm.service to entrance.service so it does not conflict with xserver-nodm-init in sysroot

login
register
mail settings
Submitter Martin Jansa
Date Dec. 4, 2012, 1:59 a.m.
Message ID <735e72e21373eebe990b47a5eb48de2bea3cd94d.1354586187.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40203/
State Accepted, archived
Headers show

Comments

Martin Jansa - Dec. 4, 2012, 1:59 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../efl/entrance/{xserver-nodm.service => entrance.service}           | 0
 meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-systemd/meta-efl/recipes-efl/efl/entrance/{xserver-nodm.service => entrance.service} (100%)

Patch

diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
similarity index 100%
rename from meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
index ac0d2bc..df96e34 100644
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
@@ -4,10 +4,10 @@  PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SRC_URI += "file://xserver-nodm.service"
+SRC_URI += "file://entrance.service"
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "xserver-nodm.service"
+SYSTEMD_SERVICE = "entrance.service"
 
 RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
 RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"