From 4be645b4f5ada8c6fb43085bf59fc8fa6d63d34d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 2 Dec 2012 15:37:40 +0100 Subject: [PATCH] entrance: rename xserver-nodm.service to entrance.service so it does not conflict with xserver-nodm-init in sysroot Signed-off-by: Martin Jansa --- .../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%) 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 ac0d2bc03e..df96e3495d 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"