diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-30 12:35:56 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-09 10:31:00 +0100 |
| commit | 0872d60659798f89eeb7bdc94060d8961a53583d (patch) | |
| tree | f845095793ad9f7b80cbf53f9abfe88ca9882ac1 /meta-efl | |
| parent | 0265a98f7140cb4c43da7e19e25fef3c205c3c8f (diff) | |
| download | meta-openembedded-0872d60659798f89eeb7bdc94060d8961a53583d.tar.gz | |
meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-efl')
| -rw-r--r-- | meta-efl/recipes-efl/efl/elsa_svn.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb index 949c7e1f80..a079ec0365 100644 --- a/meta-efl/recipes-efl/efl/elsa_svn.bb +++ b/meta-efl/recipes-efl/efl/elsa_svn.bb | |||
| @@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}" | |||
| 13 | 13 | ||
| 14 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" | 14 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" |
| 15 | 15 | ||
| 16 | PR = "r3" | 16 | PR = "r4" |
| 17 | PV = "0.0.4+svnr${SRCPV}" | 17 | PV = "0.0.4+svnr${SRCPV}" |
| 18 | SRCREV = "${EFL_SRCREV}" | 18 | SRCREV = "${EFL_SRCREV}" |
| 19 | 19 | ||
| @@ -34,5 +34,5 @@ RDEPENDS_${PN} += "${PN}-themes sessreg xauth" | |||
| 34 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" | 34 | CONFFILES_${PN} += "${sysconfdir}/elsa.conf" |
| 35 | RCONFLICTS_${PN} += "xserver-nodm-init" | 35 | RCONFLICTS_${PN} += "xserver-nodm-init" |
| 36 | RREPLACES_${PN} += "xserver-nodm-init" | 36 | RREPLACES_${PN} += "xserver-nodm-init" |
| 37 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init" | 37 | RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" |
| 38 | RREPLACES_${PN}-systemd += "xserver-nodm-init" | 38 | RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" |