diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-02 15:37:40 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-11 01:52:55 +0100 |
| commit | 4be645b4f5ada8c6fb43085bf59fc8fa6d63d34d (patch) | |
| tree | c31a1007ca48fa5f72811e8d8adb368c6dad446f /meta-systemd/meta-efl | |
| parent | cf1c42c7a3c0ccaa66b39288965d75197f7b33a9 (diff) | |
| download | meta-openembedded-4be645b4f5ada8c6fb43085bf59fc8fa6d63d34d.tar.gz | |
entrance: rename xserver-nodm.service to entrance.service so it does not conflict with xserver-nodm-init in sysroot
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd/meta-efl')
| -rw-r--r-- | meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service (renamed from meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service) | 0 | ||||
| -rw-r--r-- | meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend | 4 |
2 files changed, 2 insertions, 2 deletions
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 index 482868695..482868695 100644 --- a/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service +++ b/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 ac0d2bc03..df96e3495 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}" | |||
| 4 | 4 | ||
| 5 | inherit systemd | 5 | inherit systemd |
| 6 | 6 | ||
| 7 | SRC_URI += "file://xserver-nodm.service" | 7 | SRC_URI += "file://entrance.service" |
| 8 | 8 | ||
| 9 | SYSTEMD_PACKAGES = "${PN}-systemd" | 9 | SYSTEMD_PACKAGES = "${PN}-systemd" |
| 10 | SYSTEMD_SERVICE = "xserver-nodm.service" | 10 | SYSTEMD_SERVICE = "entrance.service" |
| 11 | 11 | ||
| 12 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" | 12 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" |
| 13 | RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" | 13 | RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" |