diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-06-16 20:08:19 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-18 13:18:53 +0100 |
| commit | 8f4e7dfd8b60a10411261666b4da2b4aff1c4231 (patch) | |
| tree | 4e7911c020b18af810cc0f698b6638e183f5fd43 /meta | |
| parent | fbcda6eff010e0a39cc0145a514e7de99f475145 (diff) | |
| download | openembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.tar.gz openembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.tar.bz2 openembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.zip | |
tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/tzdata/tzdata_2012c.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/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 fab8e01411..bce787f4a9 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 dc10031b3c..3faa16c099 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 8f28d030a6..bc9368af10 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}" |