* CONFLICTS as keyword or just misspelled RCONFLICTS?
@ 2012-05-08 18:02 Martin Jansa
2012-05-08 19:20 ` Mark Hatle
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
0 siblings, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2012-05-08 18:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]
It's used in few recipes (lately used in kmod recipe), but no .bbclass and no match in bitbake
OE @ ~/openembedded-core $ git grep CONFLICTS | grep -v RCONFLICTS | grep -v TUNE_CONFLICTS | grep -v TUNECONFLICTS
meta/recipes-connectivity/openssh/openssh_6.0p1.bb:CONFLICTS_${PN} = "dropbear"
meta/recipes-core/gettext/gettext_0.18.1.1.bb:CONFLICTS_${PN} = "proxy-libintl"
meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb:CONFLICTS = "compositeext"
meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb:CONFLICTS = "damageext"
meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb:CONFLICTS = "fixesext"
meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb:CONFLICTS = "randrext"
meta/recipes-graphics/xorg-proto/recordproto_1.14.1.bb:CONFLICTS = "recordext"
meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb:CONFLICTS = "renderext"
meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb:CONFLICTS = "resourceext"
meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb:CONFLICTS = "xxf86dgaext"
meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb:CONFLICTS = "xxf86vmext"
meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb:CONFLICTS = "matchbox-common"
meta/recipes-support/db/db_5.1.19.bb:CONFLICTS = "db3"
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
Cheers,
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: CONFLICTS as keyword or just misspelled RCONFLICTS?
2012-05-08 18:02 CONFLICTS as keyword or just misspelled RCONFLICTS? Martin Jansa
@ 2012-05-08 19:20 ` Mark Hatle
2012-05-08 19:25 ` Peter Seebach
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
1 sibling, 1 reply; 9+ messages in thread
From: Mark Hatle @ 2012-05-08 19:20 UTC (permalink / raw)
To: openembedded-core
On 5/8/12 1:02 PM, Martin Jansa wrote:
> It's used in few recipes (lately used in kmod recipe), but no .bbclass and no match in bitbake
>
> OE @ ~/openembedded-core $ git grep CONFLICTS | grep -v RCONFLICTS | grep -v TUNE_CONFLICTS | grep -v TUNECONFLICTS
> meta/recipes-connectivity/openssh/openssh_6.0p1.bb:CONFLICTS_${PN} = "dropbear"
> meta/recipes-core/gettext/gettext_0.18.1.1.bb:CONFLICTS_${PN} = "proxy-libintl"
> meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb:CONFLICTS = "compositeext"
> meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb:CONFLICTS = "damageext"
> meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb:CONFLICTS = "fixesext"
> meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb:CONFLICTS = "randrext"
> meta/recipes-graphics/xorg-proto/recordproto_1.14.1.bb:CONFLICTS = "recordext"
> meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb:CONFLICTS = "renderext"
> meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb:CONFLICTS = "resourceext"
> meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb:CONFLICTS = "xxf86dgaext"
> meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb:CONFLICTS = "xxf86vmext"
> meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb:CONFLICTS = "matchbox-common"
> meta/recipes-support/db/db_5.1.19.bb:CONFLICTS = "db3"
Not finding CONFLICTS defined anywhere, including bitbake -- I'm inclined to
agree that these should have been RCONFLICTS_<pn>, and weren't.
> 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.
--Mark
> Cheers,
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: CONFLICTS as keyword or just misspelled RCONFLICTS?
2012-05-08 19:20 ` Mark Hatle
@ 2012-05-08 19:25 ` Peter Seebach
2012-06-16 6:51 ` Martin Jansa
0 siblings, 1 reply; 9+ messages in thread
From: Peter Seebach @ 2012-05-08 19:25 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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.
-s
--
Listen, get this. Nobody with a good compiler needs to be justified.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: CONFLICTS as keyword or just misspelled RCONFLICTS?
2012-05-08 19:25 ` Peter Seebach
@ 2012-06-16 6:51 ` Martin Jansa
2012-07-07 8:31 ` [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Martin Jansa
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2012-06-16 6:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN}
2012-05-08 18:02 CONFLICTS as keyword or just misspelled RCONFLICTS? Martin Jansa
2012-05-08 19:20 ` Mark Hatle
@ 2012-06-16 18:08 ` Martin Jansa
2012-06-16 18:08 ` [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ Martin Jansa
2012-06-18 12:42 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Richard Purdie
1 sibling, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2012-06-16 18:08 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-connectivity/openssh/openssh_6.0p1.bb | 4 ++--
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 4 ++--
.../xorg-proto/compositeproto_0.4.2.bb | 4 ++--
.../xorg-proto/damageproto_1.2.1.bb | 4 ++--
meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | 4 ++--
.../xorg-proto/randrproto_1.3.2.bb | 4 ++--
.../xorg-proto/recordproto_1.14.2.bb | 4 ++--
.../xorg-proto/renderproto_0.11.1.bb | 4 ++--
.../xorg-proto/resourceproto_1.2.0.bb | 4 ++--
.../xorg-proto/xf86dgaproto_2.1.bb | 4 ++--
.../xorg-proto/xf86vidmodeproto_2.3.1.bb | 4 ++--
.../matchbox-desktop-sato_git.bb | 4 ++--
meta/recipes-support/db/db_5.3.15.bb | 4 ++--
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 04fd6a9..376023c 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -7,14 +7,14 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
-PR = "r1"
+PR = "r2"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RPROVIDES = "ssh sshd"
-CONFLICTS_${PN} = "dropbear"
+RCONFLICTS_${PN} = "dropbear"
RCONFLICTS_${PN}-sshd = "dropbear"
RCONFLICTS_${PN}-keygen = "ssh-keygen"
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 253ea43..7dd8844 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,12 +5,12 @@ SECTION = "libs"
LICENSE = "GPLv3+ & LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r13"
+PR = "r14"
DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_virtclass-native = "virtual/gettext-native"
-CONFLICTS_${PN} = "proxy-libintl"
+RCONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://parallel.patch \
"
diff --git a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
index 093ee99..adfee26 100644
--- a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
+++ b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
@@ -10,10 +10,10 @@ LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \
file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926"
-CONFLICTS = "compositeext"
+RCONFLICTS_${PN} = "compositeext"
BBCLASSEXTEND = "native"
-PR = "r0"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0"
diff --git a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
index de2d69c..75d0268 100644
--- a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
@@ -11,9 +11,9 @@ LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \
file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296"
-CONFLICTS = "damageext"
+RCONFLICTS_${PN} = "damageext"
BBCLASSEXTEND = "native"
-PR = "r0"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95"
diff --git a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
index 2c05cf7..39fb88d 100644
--- a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
+++ b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
@@ -12,8 +12,8 @@ LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \
file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4"
-CONFLICTS = "fixesext"
-PR = "r0"
+RCONFLICTS_${PN} = "fixesext"
+PR = "r1"
PE = "1"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb b/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
index e4fe37b..17b709f 100644
--- a/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=5fa3f85d9eefaa3a945071485be11343 \
file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f"
-CONFLICTS = "randrext"
-PR = "r0"
+RCONFLICTS_${PN} = "randrext"
+PR = "r1"
PE = "1"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
index 24404a7..ad2317c 100644
--- a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
+++ b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \
file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738"
-CONFLICTS = "recordext"
-PR = "r0"
+RCONFLICTS_${PN} = "recordext"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216"
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index 5eb06cb..ff800ec 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \
file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f"
-CONFLICTS = "renderext"
-PR = "r0"
+RCONFLICTS_${PN} = "renderext"
+PR = "r1"
PE = "1"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
index 92c37c6..08b610a 100644
--- a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
@@ -9,9 +9,9 @@ see and monitor X resource usage of various clients."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
-CONFLICTS = "resourceext"
+RCONFLICTS_${PN} = "resourceext"
-PR = "r0"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"
diff --git a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
index f70d79d..86f3ce3 100644
--- a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
@@ -10,8 +10,8 @@ reporting."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
-CONFLICTS = "xxf86dgaext"
-PR = "r1"
+RCONFLICTS_${PN} = "xxf86dgaext"
+PR = "r2"
PE = "1"
SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
diff --git a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
index 721e7b0..0f31900 100644
--- a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
@@ -9,9 +9,9 @@ and set video mode timings."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502"
-CONFLICTS = "xxf86vmext"
+RCONFLICTS_${PN} = "xxf86vmext"
-PR = "r0"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e"
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
index 5daeb72..e1a7e0e 100644
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SECTION = "x11"
DEPENDS = ""
-CONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
diff --git a/meta/recipes-support/db/db_5.3.15.bb b/meta/recipes-support/db/db_5.3.15.bb
index 9d2bbe5..a34ad24 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.15.bb
@@ -13,8 +13,8 @@ DESCRIPTION = "Berkeley DB v5."
HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
LICENSE = "Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
-CONFLICTS = "db3"
-PR = "r5"
+RCONFLICTS_${PN} = "db3"
+PR = "r6"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
--
1.7.8.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
@ 2012-06-16 18:08 ` Martin Jansa
2012-06-18 12:42 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Richard Purdie
1 sibling, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-06-16 18:08 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-extended/tzdata/tzdata_2012c.bb | 4 ++--
.../matchbox-session/matchbox-session_0.1.bb | 4 ++--
.../mini-x-session/mini-x-session_0.1.bb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/tzdata/tzdata_2012c.bb b/meta/recipes-extended/tzdata/tzdata_2012c.bb
index fab8e01..bce787f 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012c.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012c.bb
@@ -5,9 +5,9 @@ LICENSE = "PD"
LIC_FILES_CHKSUM = "file://asia;beginline=3;endline=4;md5=06468c0e84ef4d4c97045a4a29b08234"
DEPENDS = "tzcode-native"
-PR = "r0"
+PR = "r1"
-RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
+RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \
timezone-arctic timezone-asia timezone-atlantic \
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index dc10031..3faa16c 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -6,12 +6,12 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://matchbox-session"
S = "${WORKDIR}"
-PR = "r1"
+PR = "r2"
inherit update-alternatives
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index 8f28d03..bc9368a 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Mini X session files for poky"
HOMEPAGE = "http://www.yoctoproject.org"
BUGTRACKER = "http://bugzilla.pokylinux.org"
-PR = "r1"
+PR = "r2"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://mini-x-session"
S = "${WORKDIR}"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN}
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
2012-06-16 18:08 ` [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ Martin Jansa
@ 2012-06-18 12:42 ` Richard Purdie
1 sibling, 0 replies; 9+ messages in thread
From: Richard Purdie @ 2012-06-18 12:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2012-06-16 at 20:08 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-connectivity/openssh/openssh_6.0p1.bb | 4 ++--
> meta/recipes-core/gettext/gettext_0.18.1.1.bb | 4 ++--
> .../xorg-proto/compositeproto_0.4.2.bb | 4 ++--
> .../xorg-proto/damageproto_1.2.1.bb | 4 ++--
> meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | 4 ++--
> .../xorg-proto/randrproto_1.3.2.bb | 4 ++--
> .../xorg-proto/recordproto_1.14.2.bb | 4 ++--
> .../xorg-proto/renderproto_0.11.1.bb | 4 ++--
> .../xorg-proto/resourceproto_1.2.0.bb | 4 ++--
> .../xorg-proto/xf86dgaproto_2.1.bb | 4 ++--
> .../xorg-proto/xf86vidmodeproto_2.3.1.bb | 4 ++--
> .../matchbox-desktop-sato_git.bb | 4 ++--
> meta/recipes-support/db/db_5.3.15.bb | 4 ++--
> 13 files changed, 26 insertions(+), 26 deletions(-)
Merged to master along with 2/2, thanks.
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS
2012-06-16 6:51 ` Martin Jansa
@ 2012-07-07 8:31 ` Martin Jansa
2012-07-17 15:09 ` Saul Wold
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2012-07-07 8:31 UTC (permalink / raw)
To: openembedded-core
* it wasn't consistent with other machine configs
* reported 2 months ago..
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022154.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/machine/include/arm/arch-armv5.inc | 2 +-
meta/conf/machine/include/arm/arch-armv6.inc | 2 +-
meta/conf/machine/include/arm/arch-armv7a.inc | 2 +-
.../machine/include/powerpc/arch-powerpc64.inc | 2 +-
meta/conf/machine/include/tune-mips32.inc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 4a75530..98780e5 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
ARMPKGARCH ?= "armv5"
TUNEVALID[armv5] = "Enable instructions for ARMv5"
-TUNE_CONFLICTS[armv5] = "armv4"
+TUNECONFLICTS[armv5] = "armv4"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index da8274e..f0fee93 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
ARMPKGARCH ?= "armv6"
TUNEVALID[armv6] = "Enable instructions for ARMv6"
-TUNE_CONFLICTS[armv6] = "armv4 armv5"
+TUNECONFLICTS[armv6] = "armv4 armv5"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index c90aff5..f439de7 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
ARMPKGARCH ?= "armv7a"
TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
-TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
+TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a5e9755..f9e2b2a 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64"
require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32 nf"
+TUNECONFLICTS[m64] = "m32 nf"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 93ed5ee..03cd411 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32"
require conf/machine/include/mips/arch-mips.inc
TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
-TUNE_CONFLICTS[mips32] = "n64 n32"
+TUNECONFLICTS[mips32] = "n64 n32"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS
2012-07-07 8:31 ` [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Martin Jansa
@ 2012-07-17 15:09 ` Saul Wold
0 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2012-07-17 15:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 07/07/2012 01:31 AM, Martin Jansa wrote:
> * it wasn't consistent with other machine configs
> * reported 2 months ago..
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022154.html
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/conf/machine/include/arm/arch-armv5.inc | 2 +-
> meta/conf/machine/include/arm/arch-armv6.inc | 2 +-
> meta/conf/machine/include/arm/arch-armv7a.inc | 2 +-
> .../machine/include/powerpc/arch-powerpc64.inc | 2 +-
> meta/conf/machine/include/tune-mips32.inc | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
> diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
> index 4a75530..98780e5 100644
> --- a/meta/conf/machine/include/arm/arch-armv5.inc
> +++ b/meta/conf/machine/include/arm/arch-armv5.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
> ARMPKGARCH ?= "armv5"
>
> TUNEVALID[armv5] = "Enable instructions for ARMv5"
> -TUNE_CONFLICTS[armv5] = "armv4"
> +TUNECONFLICTS[armv5] = "armv4"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
> index da8274e..f0fee93 100644
> --- a/meta/conf/machine/include/arm/arch-armv6.inc
> +++ b/meta/conf/machine/include/arm/arch-armv6.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
> ARMPKGARCH ?= "armv6"
>
> TUNEVALID[armv6] = "Enable instructions for ARMv6"
> -TUNE_CONFLICTS[armv6] = "armv4 armv5"
> +TUNECONFLICTS[armv6] = "armv4 armv5"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index c90aff5..f439de7 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
> ARMPKGARCH ?= "armv7a"
>
> TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
> -TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
> +TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index a5e9755..f9e2b2a 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64"
> require conf/machine/include/powerpc/arch-powerpc.inc
>
> TUNEVALID[m64] = "Power ELF64 standard ABI"
> -TUNE_CONFLICTS[m64] = "m32 nf"
> +TUNECONFLICTS[m64] = "m32 nf"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
>
> diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
> index 93ed5ee..03cd411 100644
> --- a/meta/conf/machine/include/tune-mips32.inc
> +++ b/meta/conf/machine/include/tune-mips32.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32"
> require conf/machine/include/mips/arch-mips.inc
>
> TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
> -TUNE_CONFLICTS[mips32] = "n64 n32"
> +TUNECONFLICTS[mips32] = "n64 n32"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
>
> AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-07-17 15:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-08 18:02 CONFLICTS as keyword or just misspelled RCONFLICTS? Martin Jansa
2012-05-08 19:20 ` Mark Hatle
2012-05-08 19:25 ` Peter Seebach
2012-06-16 6:51 ` Martin Jansa
2012-07-07 8:31 ` [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Martin Jansa
2012-07-17 15:09 ` Saul Wold
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
2012-06-16 18:08 ` [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ Martin Jansa
2012-06-18 12:42 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.