sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ 

(From OE-Core rev: 8f4e7dfd8b60a10411261666b4da2b4aff1c4231)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2012-06-16 20:08:19 +02:00 committed by Richard Purdie
parent 79e4de8406
commit 85d7c018fe
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-extended/tzdata/tzdata_2012c.bb
View File

@ -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"

4
meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
View File

@ -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

4
meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
View File

@ -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}"