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:24:58 +0100 |
| commit | 85d7c018fe2befacc1b0f81b0ae80e0aa5dc76c1 (patch) | |
| tree | 6e1815023d5a14ee0ad3b043c3265ea88b810421 /meta/recipes-graphics/matchbox-session | |
| parent | 79e4de84063cdd3d8eab65ae93d9c896829212e8 (diff) | |
| download | poky-85d7c018fe2befacc1b0f81b0ae80e0aa5dc76c1.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/matchbox-session')
| -rw-r--r-- | meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
| 6 | LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" | 6 | LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" |
| 7 | 7 | ||
| 8 | SECTION = "x11" | 8 | SECTION = "x11" |
| 9 | RCONFLICTS = "matchbox-common" | 9 | RCONFLICTS_${PN} = "matchbox-common" |
| 10 | 10 | ||
| 11 | SRC_URI = "file://matchbox-session" | 11 | SRC_URI = "file://matchbox-session" |
| 12 | S = "${WORKDIR}" | 12 | S = "${WORKDIR}" |
| 13 | 13 | ||
| 14 | PR = "r1" | 14 | PR = "r2" |
| 15 | 15 | ||
| 16 | inherit update-alternatives | 16 | inherit update-alternatives |
| 17 | 17 | ||