Patchwork [1/2] packagegroup-core-x11: add upgrade path from meta-oe task-x11*

login
register
mail settings
Submitter Martin Jansa
Date Sept. 4, 2012, 8:58 p.m.
Message ID <1346792317-26563-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/35839/
State Accepted
Commit 3b428debe9fdd4c9197f5ee7ab34fc9886f4a3cb
Headers show

Comments

Martin Jansa - Sept. 4, 2012, 8:58 p.m.
From: Paul Eggleton <paul.eggleton@linux.intel.com>

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>
---
 .../recipes-graphics/packagegroups/packagegroup-core-x11.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Patch

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"