summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-11-30 00:29:11 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-12-06 13:08:29 +0100
commit1bc18fca9e935ed2c2cfb92517da26737cf9d2be (patch)
tree90650b9b06b69ccddf8aa06afaa16c7135b8eaf0 /meta-efl
parentd118787722005d0dcd2913983cc1855fc5c8745f (diff)
downloadmeta-openembedded-1bc18fca9e935ed2c2cfb92517da26737cf9d2be.tar.gz
elsa: add systemd service and add RCONFLICTS/RREPLACES with xserver-nodm-init
* add RCONFLICTS/RREPLACES also to PN-systemd, because that's where file collision with xserver-nodm-init is, in PN it's just functional collision * fixes upgrade path for task-x11-utils Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/efl/elsa/xserver-nodm.service8
-rw-r--r--meta-efl/recipes-efl/efl/elsa_svn.bb20
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
new file mode 100644
index 000000000..0b9c0f559
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
@@ -0,0 +1,8 @@
1[Unit]
2Description=Login manager for Enlightenment
3
4[Service]
5ExecStart=/usr/sbin/elsa
6
7[Install]
8WantedBy=multi-user.target
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index e2f6fd7b9..f885daf47 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -7,14 +7,32 @@ SECTION = "e/apps"
7inherit e gettext 7inherit e gettext
8SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ 8SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
9 file://0001-pam-use-common-auth-instead-of-system-auth.patch \ 9 file://0001-pam-use-common-auth-instead-of-system-auth.patch \
10 file://xserver-nodm.service \
10" 11"
11S = "${WORKDIR}/${SRCNAME}" 12S = "${WORKDIR}/${SRCNAME}"
12 13
13EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" 14EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
14 15
15PR = "r1" 16PR = "r2"
16PV = "0.0.4+svnr${SRCPV}" 17PV = "0.0.4+svnr${SRCPV}"
17SRCREV = "${EFL_SRCREV}" 18SRCREV = "${EFL_SRCREV}"
18 19
20do_install_append() {
21 install -d ${D}${base_libdir}/systemd/system/
22 install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${base_libdir}/systemd/system/xserver-nodm.service
23}
24
25inherit systemd
26SYSTEMD_PACKAGES = "${PN}-systemd"
27SYSTEMD_SERVICE = "xserver-nodm.service"
28
29PACKAGES =+ "${PN}-systemd"
30FILES_${PN}-systemd += "${base_libdir}/systemd"
31RDEPENDS_${PN}-systemd += "${PN}"
32
19RDEPENDS_${PN} += "${PN}-themes sessreg xauth" 33RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
20CONFFILES_${PN} += "${sysconfdir}/elsa.conf" 34CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
35RCONFLICTS_${PN} += "xserver-nodm-init"
36RREPLACES_${PN} += "xserver-nodm-init"
37RCONFLICTS_${PN}-systemd += "xserver-nodm-init"
38RREPLACES_${PN}-systemd += "xserver-nodm-init"