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

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 4, 2012, 6:05 p.m.
Message ID <1346781919-20817-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/35833/
State Accepted
Commit 1b07bd4c6b1ff70267b97f94b25026a8f8ad3314
Headers show

Comments

Paul Eggleton - Sept. 4, 2012, 6:05 p.m.
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 <paul.eggleton@linux.intel.com>
---
 .../packagegroups/packagegroup-base.bb             |   10 ++++------
 .../packagegroups/packagegroup-core-basic.bb       |    4 +++-
 2 files changed, 7 insertions(+), 7 deletions(-)
Saul Wold - Sept. 10, 2012, 3:37 p.m.
On 09/04/2012 11:05 AM, Paul Eggleton wrote:
> 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 <paul.eggleton@linux.intel.com>
> ---
>   .../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"))
>   }
>
>
>

Merged into OE-Core

Thanks
	Sau!

Patch

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"))
 }