diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:45 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:06 +0200 |
commit | 46acf9d3b53f45faedf4991bb8320f89d589157a (patch) | |
tree | f0cb1ffe7f21f81a2bac54389d6e55d2caabe13c /meta-efl/recipes-efl/efl | |
parent | 8149b358f9ad37a8dd16fe45fbf9d1e6551b9265 (diff) | |
download | meta-openembedded-46acf9d3b53f45faedf4991bb8320f89d589157a.tar.gz |
elsa: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-efl/recipes-efl/efl')
-rw-r--r-- | meta-efl/recipes-efl/efl/elsa/xserver-nodm.service | 8 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/elsa_svn.bb | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service deleted file mode 100644 index 0b9c0f559..000000000 --- a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Login manager for Enlightenment | ||
3 | |||
4 | [Service] | ||
5 | ExecStart=/usr/sbin/elsa | ||
6 | |||
7 | [Install] | ||
8 | WantedBy=multi-user.target | ||
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb index b8a4f6330..e781ce29e 100644 --- a/meta-efl/recipes-efl/efl/elsa_svn.bb +++ b/meta-efl/recipes-efl/efl/elsa_svn.bb | |||
@@ -4,12 +4,11 @@ LICENSE = "GPLv3+" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | SECTION = "e/apps" | 5 | SECTION = "e/apps" |
6 | 6 | ||
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | inherit e gettext | 9 | inherit e gettext |
10 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ | 10 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ |
11 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ | 11 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ |
12 | file://xserver-nodm.service \ | ||
13 | " | 12 | " |
14 | S = "${WORKDIR}/${SRCNAME}" | 13 | S = "${WORKDIR}/${SRCNAME}" |
15 | 14 | ||
@@ -18,13 +17,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains | |||
18 | PV = "0.0.4+svnr${SRCPV}" | 17 | PV = "0.0.4+svnr${SRCPV}" |
19 | SRCREV = "${EFL_SRCREV}" | 18 | SRCREV = "${EFL_SRCREV}" |
20 | 19 | ||
21 | inherit systemd | ||
22 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
23 | SYSTEMD_SERVICE = "xserver-nodm.service" | ||
24 | |||
25 | RDEPENDS_${PN} += "${PN}-themes sessreg xauth" | 20 | RDEPENDS_${PN} += "${PN}-themes sessreg xauth" |
26 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" | 21 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" |
27 | RCONFLICTS_${PN} += "xserver-nodm-init" | 22 | RCONFLICTS_${PN} += "xserver-nodm-init" |
28 | RREPLACES_${PN} += "xserver-nodm-init" | 23 | RREPLACES_${PN} += "xserver-nodm-init" |
29 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" | ||
30 | RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" | ||