From 7472037569b42386592c060d54196f0c8b9e2d5d Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 14 Jul 2014 08:24:44 -0400 Subject: Remove long-deprecated "task-core" backward compat for packagegroups. Signed-off-by: Robert P. J. Day Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | 5 ----- meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | 5 ----- .../packagegroups/packagegroup-core-x11-xserver.bb | 5 ----- meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 8 -------- 4 files changed, 23 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index cb2aba0a5f..7540821c4e 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -13,11 +13,6 @@ PACKAGES = "\ ${PN}-core \ " -# For backwards compatibility after rename -RPROVIDES_${PN}-core = "task-core-clutter-core" -RREPLACES_${PN}-core = "task-core-clutter-core" -RCONFLICTS_${PN}-core = "task-core-clutter-core" - SUMMARY_${PN}-core = "Clutter graphics library" RDEPENDS_${PN}-core = "\ clutter-1.0 \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index a5d02ede8e..2eff3713bc 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -5,11 +5,6 @@ PR = "r1" inherit packagegroup -# For backwards compatibility after rename -RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base" -RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base" -RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base" - RDEPENDS_${PN} = "\ packagegroup-core-x11-xserver \ packagegroup-core-x11-utils \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index d58f74384f..f595a54e9d 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -17,8 +17,3 @@ RDEPENDS_${PN} = "\ ${XSERVER} \ ${XSERVERCODECS} \ " - -# Allow replacing task-x11-server in meta-oe -RPROVIDES_${PN} = "task-x11-server task-xserver" -RREPLACES_${PN} = "task-x11-server task-xserver" -RCONFLICTS_${PN} = "task-x11-server task-xserver" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 1a51428eaf..fde5144b46 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -30,11 +30,3 @@ 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}-utils = "task-x11-utils" -RREPLACES_${PN}-utils = "task-x11-utils" -RCONFLICTS_${PN}-utils = "task-x11-utils" -- cgit v1.2.3