From 6554dbf95655c63c9fc8bdfbc67d93b6054bc441 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 4 Sep 2012 22:58:36 +0200 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../recipes-graphics/packagegroups/packagegroup-core-x11.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'meta') 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" -- cgit v1.2.3-54-g00ecf