All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_
Date: Sat, 16 Jun 2012 20:08:19 +0200	[thread overview]
Message-ID: <1339870099-24648-2-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1339870099-24648-1-git-send-email-Martin.Jansa@gmail.com>

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




  reply	other threads:[~2012-06-16 18:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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   ` Martin Jansa [this message]
2012-06-18 12:42   ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339870099-24648-2-git-send-email-Martin.Jansa@gmail.com \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.