diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2020-07-11 02:37:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 02:37:34 +0300 |
| commit | 2a11ae52fca0d1c0e12b4f18da637645eecc213c (patch) | |
| tree | 05a1d365e0faa6ce8570b2d0c2d0f100dc8df1d4 /poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | |
| parent | efa39df15c70a1ab300cfa87e9895d5ee1feb5be (diff) | |
| parent | d071adf43ac87f21dde2f84287120960c723962c (diff) | |
| download | openbmc-2a11ae52fca0d1c0e12b4f18da637645eecc213c.tar.xz | |
Merge pull request #44 from Intel-BMC/update
Update
Diffstat (limited to 'poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb')
| -rw-r--r-- | poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index 15a8e6ded..16c2f9f2a 100644 --- a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -32,21 +32,23 @@ python __anonymous () { namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" packages = d.getVar("PACKAGES").split() + mlprefix = d.getVar("MLPREFIX") for pkg in packages: + pkg2 = pkg[len(mlprefix):] if pkg.endswith('-dev'): - mapped = namemap.get(pkg[:-4], None) + mapped = namemap.get(pkg2[:-4], None) if mapped: mapped += '-dev' elif pkg.endswith('-dbg'): - mapped = namemap.get(pkg[:-4], None) + mapped = namemap.get(pkg2[:-4], None) if mapped: mapped += '-dbg' else: - mapped = namemap.get(pkg, None) + mapped = namemap.get(pkg2, None) if mapped: oldtaskname = mapped.replace("packagegroup-core", "task-core") - mapstr = " %s %s" % (mapped, oldtaskname) + mapstr = " %s%s %s%s" % (mlprefix, mapped, mlprefix, oldtaskname) d.appendVar("RPROVIDES_%s" % pkg, mapstr) d.appendVar("RREPLACES_%s" % pkg, mapstr) d.appendVar("RCONFLICTS_%s" % pkg, mapstr) |