diff options
Diffstat (limited to 'meta/recipes-extended/packagegroups')
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index 15a8e6dedc..16c2f9f2aa 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | |||
@@ -32,21 +32,23 @@ python __anonymous () { | |||
32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" | 32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" |
33 | 33 | ||
34 | packages = d.getVar("PACKAGES").split() | 34 | packages = d.getVar("PACKAGES").split() |
35 | mlprefix = d.getVar("MLPREFIX") | ||
35 | for pkg in packages: | 36 | for pkg in packages: |
37 | pkg2 = pkg[len(mlprefix):] | ||
36 | if pkg.endswith('-dev'): | 38 | if pkg.endswith('-dev'): |
37 | mapped = namemap.get(pkg[:-4], None) | 39 | mapped = namemap.get(pkg2[:-4], None) |
38 | if mapped: | 40 | if mapped: |
39 | mapped += '-dev' | 41 | mapped += '-dev' |
40 | elif pkg.endswith('-dbg'): | 42 | elif pkg.endswith('-dbg'): |
41 | mapped = namemap.get(pkg[:-4], None) | 43 | mapped = namemap.get(pkg2[:-4], None) |
42 | if mapped: | 44 | if mapped: |
43 | mapped += '-dbg' | 45 | mapped += '-dbg' |
44 | else: | 46 | else: |
45 | mapped = namemap.get(pkg, None) | 47 | mapped = namemap.get(pkg2, None) |
46 | 48 | ||
47 | if mapped: | 49 | if mapped: |
48 | oldtaskname = mapped.replace("packagegroup-core", "task-core") | 50 | oldtaskname = mapped.replace("packagegroup-core", "task-core") |
49 | mapstr = " %s %s" % (mapped, oldtaskname) | 51 | mapstr = " %s%s %s%s" % (mlprefix, mapped, mlprefix, oldtaskname) |
50 | d.appendVar("RPROVIDES_%s" % pkg, mapstr) | 52 | d.appendVar("RPROVIDES_%s" % pkg, mapstr) |
51 | d.appendVar("RREPLACES_%s" % pkg, mapstr) | 53 | d.appendVar("RREPLACES_%s" % pkg, mapstr) |
52 | d.appendVar("RCONFLICTS_%s" % pkg, mapstr) | 54 | d.appendVar("RCONFLICTS_%s" % pkg, mapstr) |