From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 4 Sep 2012 20:58:36 +0000 (+0200)
Subject: packagegroup-core-x11: add upgrade path from meta-oe task-x11*
X-Git-Tag: 2015-4~9263
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3b428debe9fdd4c9197f5ee7ab34fc9886f4a3cb;p=openembedded-core.git

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.

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>
---

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"