summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-04 17:43:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 18:03:18 +0100
commit29c19460e242c37e2cd12577e5835829ffa16b98 (patch)
treee73dc8ddb7fef074dafd689377ef51a4d262bde5 /meta/recipes-graphics
parent748e48249d1f7817f670d8d00ace34cbf2c11b29 (diff)
downloadpoky-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-graphics')
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb4
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 @@
5SUMMARY = "Clutter package groups" 5SUMMARY = "Clutter package groups"
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
8PR = "r4" 8PR = "r5"
9 9
10inherit packagegroup 10inherit packagegroup
11 11
@@ -15,6 +15,8 @@ PACKAGES = "\
15 15
16# For backwards compatibility after rename 16# For backwards compatibility after rename
17RPROVIDES_${PN}-core = "task-core-clutter-core" 17RPROVIDES_${PN}-core = "task-core-clutter-core"
18RREPLACES_${PN}-core = "task-core-clutter-core"
19RCONFLICTS_${PN}-core = "task-core-clutter-core"
18 20
19SUMMARY_${PN}-core = "Clutter graphics library" 21SUMMARY_${PN}-core = "Clutter graphics library"
20RDEPENDS_${PN}-core = "\ 22RDEPENDS_${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 @@
1SUMMARY = "GTK+ over DirectFB without X11" 1SUMMARY = "GTK+ over DirectFB without X11"
2PR = "r0" 2PR = "r1"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-core-gtk-directfb-base" 8RPROVIDES_${PN} = "task-core-gtk-directfb-base"
9RREPLACES_${PN} = "task-core-gtk-directfb-base"
10RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
9 11
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 12TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 13
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 @@
1SUMMARY = "Basic X11 session" 1SUMMARY = "Basic X11 session"
2DESCRIPTION = "Packages required to set up a basic working X11 session" 2DESCRIPTION = "Packages required to set up a basic working X11 session"
3LICENSE = "MIT" 3LICENSE = "MIT"
4PR = "r0" 4PR = "r1"
5 5
6inherit packagegroup 6inherit packagegroup
7 7
8# For backwards compatibility after rename 8# For backwards compatibility after rename
9RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base" 9RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
10RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
11RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
10 12
11RDEPENDS_${PN} = "\ 13RDEPENDS_${PN} = "\
12 packagegroup-core-x11-xserver \ 14 packagegroup-core-x11-xserver \