[oe] [RFC, meta-oe 12/27] elsa: move systemd support to meta-systemd
Andreas Müller
schnitzeltony at googlemail.com
Sun Jun 10 21:46:45 UTC 2012
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
meta-efl/recipes-efl/efl/elsa_svn.bb | 9 +--------
.../recipes-efl/efl/elsa/xserver-nodm.service | 0
.../meta-efl/recipes-efl/efl/elsa_svn.bbappend | 13 +++++++++++++
3 files changed, 14 insertions(+), 8 deletions(-)
rename {meta-efl => meta-systemd/meta-efl}/recipes-efl/efl/elsa/xserver-nodm.service (100%)
create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index b8a4f63..e781ce2 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-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
similarity index 100%
rename from meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
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 0000000..871f687
--- /dev/null
+++ b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS := "${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"
--
1.7.4.4
More information about the Openembedded-devel
mailing list