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 | |
parent | 8149b358f9ad37a8dd16fe45fbf9d1e6551b9265 (diff) | |
download | meta-openembedded-contrib-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')
-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 0b9c0f559b..0000000000 --- a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Login manager for Enlightenment - -[Service] -ExecStart=/usr/sbin/elsa - -[Install] -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 b8a4f6330c..e781ce29e6 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "e/apps" -PR = "r1" +PR = "r2" inherit e gettext SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ file://0001-pam-use-common-auth-instead-of-system-auth.patch \ - file://xserver-nodm.service \ " S = "${WORKDIR}/${SRCNAME}" @@ -18,13 +17,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains PV = "0.0.4+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" -inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "xserver-nodm.service" - RDEPENDS_${PN} += "${PN}-themes sessreg xauth" CONFFILES_${PN} += "${sysconfdir}/elsa.conf" RCONFLICTS_${PN} += "xserver-nodm-init" RREPLACES_${PN} += "xserver-nodm-init" -RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" -RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" |