From patchwork Tue Sep 4 18:05:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: packagegroup-(base|core-basic): add RREPLACES/RCONFLICTS Date: Tue, 04 Sep 2012 18:05:19 -0000 From: Paul Eggleton X-Patchwork-Id: 35833 Message-Id: <1346781919-20817-1-git-send-email-paul.eggleton@linux.intel.com> To: openembedded-core@lists.openembedded.org These are needed to support upgrading from task-* to packagegroup-* within existing target images at runtime. Note: these settings will very likely be moved to a separate inc file at some point in the future. Signed-off-by: Paul Eggleton --- .../packagegroups/packagegroup-base.bb | 10 ++++------ .../packagegroups/packagegroup-core-basic.bb | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 2178308..347a7e1 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" LICENSE = "MIT" -PR = "r75" +PR = "r76" inherit packagegroup @@ -117,12 +117,10 @@ python __anonymous () { # For backwards compatibility after rename packages = d.getVar("PACKAGES", True).split() - packages.remove("packagegroup-distro-base") - packages.remove("packagegroup-machine-base") for pkg in packages: - d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-base", "task-base")) - d.appendVar("RPROVIDES_packagegroup-distro-base", "task-distro-base") - d.appendVar("RPROVIDES_packagegroup-machine-base", "task-machine-base") + d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-")) + d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-")) + d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-")) } # diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb index 30b66c5..d3eeeed 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "Create Basic Image Tasks" -PR = "r4" +PR = "r5" LICENSE = "MIT" inherit packagegroup @@ -24,6 +24,8 @@ python __anonymous () { packages = d.getVar("PACKAGES", True).split() for pkg in packages: d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core")) + d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-core", "task-core")) + d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-core", "task-core")) }