From 46acf9d3b53f45faedf4991bb8320f89d589157a Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:45 +0000 Subject: elsa: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-efl/recipes-efl/efl/elsa/xserver-nodm.service | 8 -------- meta-efl/recipes-efl/efl/elsa_svn.bb | 9 +-------- .../meta-efl/recipes-efl/efl/elsa/xserver-nodm.service | 8 ++++++++ meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend | 13 +++++++++++++ 4 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/elsa/xserver-nodm.service create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend 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" diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service new file mode 100644 index 0000000000..0b9c0f559b --- /dev/null +++ b/meta-systemd/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-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend new file mode 100644 index 0000000000..ac0d2bc03e --- /dev/null +++ b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend @@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += "file://xserver-nodm.service" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "xserver-nodm.service" + +RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" +RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" -- cgit v1.2.3-54-g00ecf