packagegroup-(base|core-basic): add RREPLACES/RCONFLICTS

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 <[email protected]>

---
  .../packagegroups/packagegroup-base.bb             |   10 ++++------
  .../packagegroups/packagegroup-core-basic.bb       |    4 +++-
  2 files changed, 7 insertions(+), 7 deletions(-)

meta/recipes-core/packagegroups/packagegroup-base.bb +4 -6

index 2178308..347a7e1 100644
@@ -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-"))
  }
 
  #

meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +1 -1

index 30b66c5..d3eeeed 100644
@@ -3,7 +3,7 @@
  #
 
  DESCRIPTION = "Create Basic Image Tasks"
-PR = "r4"
+PR = "r5"
  LICENSE = "MIT"
 
  inherit packagegroup