mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd

Browse Source 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador
2011-12-30 12:35:56 +00:00
committed by Koen Kooi
parent 0265a98f71
commit 0872d60659
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efl/recipes-efl/efl/elsa_svn.bb
+3 -3
View File
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
PR = "r3" PR = "r4"
PV = "0.0.4+svnr${SRCPV}" PV = "0.0.4+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}" SRCREV = "${EFL_SRCREV}"
@@ -34,5 +34,5 @@ RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
CONFFILES_${PN} += "${sysconfdir}/elsa.conf" CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
RCONFLICTS_${PN} += "xserver-nodm-init" RCONFLICTS_${PN} += "xserver-nodm-init"
RREPLACES_${PN} += "xserver-nodm-init" RREPLACES_${PN} += "xserver-nodm-init"
RCONFLICTS_${PN}-systemd += "xserver-nodm-init" RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
RREPLACES_${PN}-systemd += "xserver-nodm-init" RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"