diff options
-rw-r--r-- | meta-efl/recipes-efl/efl/elsa_svn.bb | 9 | ||||
-rw-r--r-- | meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service (renamed from meta-efl/recipes-efl/efl/elsa/xserver-nodm.service) | 0 | ||||
-rw-r--r-- | meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend | 13 |
3 files changed, 14 insertions, 8 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb index b8a4f6330..e781ce29e 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+" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | SECTION = "e/apps" | 5 | SECTION = "e/apps" |
6 | 6 | ||
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | inherit e gettext | 9 | inherit e gettext |
10 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ | 10 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ |
11 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ | 11 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ |
12 | file://xserver-nodm.service \ | ||
13 | " | 12 | " |
14 | S = "${WORKDIR}/${SRCNAME}" | 13 | S = "${WORKDIR}/${SRCNAME}" |
15 | 14 | ||
@@ -18,13 +17,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains | |||
18 | PV = "0.0.4+svnr${SRCPV}" | 17 | PV = "0.0.4+svnr${SRCPV}" |
19 | SRCREV = "${EFL_SRCREV}" | 18 | SRCREV = "${EFL_SRCREV}" |
20 | 19 | ||
21 | inherit systemd | ||
22 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
23 | SYSTEMD_SERVICE = "xserver-nodm.service" | ||
24 | |||
25 | RDEPENDS_${PN} += "${PN}-themes sessreg xauth" | 20 | RDEPENDS_${PN} += "${PN}-themes sessreg xauth" |
26 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" | 21 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" |
27 | RCONFLICTS_${PN} += "xserver-nodm-init" | 22 | RCONFLICTS_${PN} += "xserver-nodm-init" |
28 | RREPLACES_${PN} += "xserver-nodm-init" | 23 | RREPLACES_${PN} += "xserver-nodm-init" |
29 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" | ||
30 | 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 index 0b9c0f559..0b9c0f559 100644 --- a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service +++ b/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 000000000..ac0d2bc03 --- /dev/null +++ b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend | |||
@@ -0,0 +1,13 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 1}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += "file://xserver-nodm.service" | ||
8 | |||
9 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
10 | SYSTEMD_SERVICE = "xserver-nodm.service" | ||
11 | |||
12 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" | ||
13 | RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" | ||