Re: CONFLICTS as keyword or just misspelled RCONFLICTS?

From: Martin Jansa <martin.jansa@gmail.com>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: CONFLICTS as keyword or just misspelled RCONFLICTS?
Date: Sat, 16 Jun 2012 08:51:04 +0200	[thread overview]
Message-ID: <20120616065104.GA3140@jama.jama.net> (raw)
In-Reply-To: <20120508142558.5837dc31@wrlaptop>

[-- Attachment #1: Type: text/plain, Size: 2224 bytes --]

On Tue, May 08, 2012 at 02:25:58PM -0500, Peter Seebach wrote:
> On Tue, 8 May 2012 14:20:16 -0500
> Mark Hatle <mark.hatle@windriver.com> wrote:
> 
> > > BTW: IIRC TUNE_CONFLICTS/TUNECONFLICTS inconsistency was discussed
> > > on ML already (I could not find that thread, but still it's used in
> > > meta/conf/machine/include/arm  
> > 
> > Ya, patches to fix these, and actually check them were sent to the
> > list, but I don't believe they have been merged yet.
> 
> I hadn't noticed TUNE_CONFLICTS, just TUNECONFLICT and TUNECONFLICTS.
> 
> As of this writing, I have two outstanding patches to do with that; I
> think the consistency patch is in, but we're still waiting on
> approval/more changes decisions on the sanity check implementation.

Any update on that?

OE @ ~/openembedded-core $ git grep TUNECONFLICTS
meta/classes/sanity.bbclass:    conflicts = data.getVarFlags('TUNECONFLICTS') or {}
meta/conf/documentation.conf:TUNECONFLICTS[doc] = "List of conflicting features for a given feature."
meta/conf/machine/include/README:TUNECONFLICTS[feature] - A list of features which conflict with <feature>.
meta/conf/machine/include/ia32/arch-ia32.inc:TUNECONFLICTS[m32] = "m64 mx32"
meta/conf/machine/include/ia32/arch-ia32.inc:TUNECONFLICTS[mx32] = "m64 m32"
meta/conf/machine/include/ia32/arch-ia32.inc:TUNECONFLICTS[m64] = "m32 mx32"
meta/conf/machine/include/mips/arch-mips.inc:TUNECONFLICTS[o32] = "n32 n64"
meta/conf/machine/include/mips/arch-mips.inc:TUNECONFLICTS[n32] = "o32 n64"
meta/conf/machine/include/mips/arch-mips.inc:TUNECONFLICTS[n64] = "o32 n32"
meta/conf/machine/include/tune-c3.inc:TUNECONFLICTS[c3] = "m64 mx32"

OE @ ~/openembedded-core $ git grep TUNE_CONFLICTS
meta/conf/machine/include/arm/arch-armv5.inc:TUNE_CONFLICTS[armv5] = "armv4"
meta/conf/machine/include/arm/arch-armv6.inc:TUNE_CONFLICTS[armv6] = "armv4 armv5"
meta/conf/machine/include/arm/arch-armv7a.inc:TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
meta/conf/machine/include/powerpc/arch-powerpc64.inc:TUNE_CONFLICTS[m64] = "m32 nf"
meta/conf/machine/include/tune-mips32.inc:TUNE_CONFLICTS[mips32] = "n64 n32"

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]