diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-04 17:43:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 18:03:18 +0100 |
| commit | 29c19460e242c37e2cd12577e5835829ffa16b98 (patch) | |
| tree | e73dc8ddb7fef074dafd689377ef51a4d262bde5 /meta/recipes-qt | |
| parent | 748e48249d1f7817f670d8d00ace34cbf2c11b29 (diff) | |
| download | ast2050-yocto-poky-29c19460e242c37e2cd12577e5835829ffa16b98.zip ast2050-yocto-poky-29c19460e242c37e2cd12577e5835829ffa16b98.tar.gz | |
packagegroup-*: add RREPLACES/RCONFLICTS
These are needed to support upgrading from task-* to packagegroup-*
within existing target images at runtime.
Note: these settings will very likely be moved out to a separate inc
file at some point in the future.
(From OE-Core rev: 5dd4de086d744c81d2275077ad0e0022204b0a68)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index ed13354..315df33 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Qt package groups" LICENSE = "MIT" -PR = "r3" +PR = "r4" inherit packagegroup @@ -12,6 +12,8 @@ PACKAGES = "${PN}-demoapps" # For backwards compatibility after rename RPROVIDES_${PN}-demoapps = "task-core-qt-demos" +RREPLACES_${PN}-demoapps = "task-core-qt-demos" +RCONFLICTS_${PN}-demoapps = "task-core-qt-demos" QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index 042efb8..9263828 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb @@ -1,11 +1,13 @@ SUMMARY = "Qt for Embedded Linux (Qt without X11)" -PR = "r1" +PR = "r2" LICENSE = "MIT" inherit packagegroup # For backwards compatibility after rename RPROVIDES_${PN} = "task-qt4e-base" +RREPLACES_${PN} = "task-qt4e-base" +RCONFLICTS_${PN} = "task-qt4e-base" TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
