mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.

(From OE-Core rev: 1b07bd4c6b1ff70267b97f94b25026a8f8ad3314)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2012-09-04 19:05:19 +01:00
committed by Richard Purdie
parent 5084e47851
commit 38e71739d9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/packagegroups/packagegroup-base.bb
+4 -6
View File
@@ -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
+3 -1
View File
@@ -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"))
}