summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-04 22:58:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 17:37:15 +0100
commit6554dbf95655c63c9fc8bdfbc67d93b6054bc441 (patch)
treec46a2314e0ba968734f88b371cfc6be6f3ebfaaa
parent71d3d1a7dbb85405e8ab99dacb832aa14447e194 (diff)
downloadpoky-6554dbf95655c63c9fc8bdfbc67d93b6054bc441.tar.gz
poky-6554dbf95655c63c9fc8bdfbc67d93b6054bc441.tar.bz2
poky-6554dbf95655c63c9fc8bdfbc67d93b6054bc441.zip
packagegroup-core-x11: add upgrade path from meta-oe task-x11*
This recipe was structured in order to replace task-x11 from meta-oe, which it hopefully can now that a runtime upgrade path is in place. (From OE-Core rev: 3b428debe9fdd4c9197f5ee7ab34fc9886f4a3cb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 37045213ad..e306c08ce2 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -3,7 +3,7 @@
#
LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
inherit packagegroup
@@ -39,3 +39,14 @@ RDEPENDS_${PN}-utils = "\
xset \
xrandr \
"
+
+# Allow replacing task-x11* in meta-oe
+RPROVIDES_${PN} = "task-x11"
+RREPLACES_${PN} = "task-x11"
+RCONFLICTS_${PN} = "task-x11"
+RPROVIDES_${PN}-xserver = "task-x11-server task-xserver"
+RREPLACES_${PN}-xserver = "task-x11-server"
+RCONFLICTS_${PN}-xserver = "task-x11-server"
+RPROVIDES_${PN}-utils = "task-x11-utils"
+RREPLACES_${PN}-utils = "task-x11-utils"
+RCONFLICTS_${PN}-utils = "task-x11-utils"