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:13 +0100 |
| commit | 5dd4de086d744c81d2275077ad0e0022204b0a68 (patch) | |
| tree | 6ec64251dbcabb7098fcfd5157b800fb8ebc5490 /meta/recipes-graphics/packagegroups | |
| parent | c65f8af02ebba371f96119baef0520c6685c7167 (diff) | |
| download | openembedded-core-5dd4de086d744c81d2275077ad0e0022204b0a68.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/packagegroups')
3 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 37e9a877e1..7b1cedc7f5 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -5,7 +5,7 @@ SUMMARY = "Clutter package groups" LICENSE = "MIT" -PR = "r4" +PR = "r5" inherit packagegroup @@ -15,6 +15,8 @@ PACKAGES = "\ # For backwards compatibility after rename RPROVIDES_${PN}-core = "task-core-clutter-core" +RREPLACES_${PN}-core = "task-core-clutter-core" +RCONFLICTS_${PN}-core = "task-core-clutter-core" SUMMARY_${PN}-core = "Clutter graphics library" RDEPENDS_${PN}-core = "\ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb index d6c29853eb..55b0b9d020 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb @@ -1,11 +1,13 @@ SUMMARY = "GTK+ over DirectFB without X11" -PR = "r0" +PR = "r1" LICENSE = "MIT" inherit packagegroup # For backwards compatibility after rename RPROVIDES_${PN} = "task-core-gtk-directfb-base" +RREPLACES_${PN} = "task-core-gtk-directfb-base" +RCONFLICTS_${PN} = "task-core-gtk-directfb-base" TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index ebae741832..a5d02ede8e 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -1,12 +1,14 @@ SUMMARY = "Basic X11 session" DESCRIPTION = "Packages required to set up a basic working X11 session" LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit packagegroup # For backwards compatibility after rename RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base" +RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base" +RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base" RDEPENDS_${PN} = "\ packagegroup-core-x11-xserver \ |