diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-11-30 00:29:11 +0100 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-12-06 13:08:29 +0100 |
| commit | 1bc18fca9e935ed2c2cfb92517da26737cf9d2be (patch) | |
| tree | 90650b9b06b69ccddf8aa06afaa16c7135b8eaf0 /meta-efl | |
| parent | d118787722005d0dcd2913983cc1855fc5c8745f (diff) | |
| download | meta-openembedded-contrib-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.service | 8 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/elsa_svn.bb | 20 |
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 0000000000..0b9c0f559b --- /dev/null +++ b/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service @@ -0,0 +1,8 @@ +[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 e2f6fd7b95..f885daf47e 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" 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}" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" -PR = "r1" +PR = "r2" PV = "0.0.4+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" +do_install_append() { + install -d ${D}${base_libdir}/systemd/system/ + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${base_libdir}/systemd/system/xserver-nodm.service +} + +inherit systemd +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "xserver-nodm.service" + +PACKAGES =+ "${PN}-systemd" +FILES_${PN}-systemd += "${base_libdir}/systemd" +RDEPENDS_${PN}-systemd += "${PN}" + 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" +RREPLACES_${PN}-systemd += "xserver-nodm-init" |