[oe-commits] Paul Eggleton : packagegroup-core-x11: add upgrade path from meta-oe task-x11*

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3b428debe9fdd4c9197f5ee7ab34fc9886f4a3cb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3b428debe9fdd4c9197f5ee7ab34fc9886f4a3cb

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Sep  4 22:58:36 2012 +0200

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 at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../packagegroups/packagegroup-core-x11.bb         |   13 ++++++++++++-
 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 3704521..e306c08 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"