From 74e79e732a5f0c511d06be6b3b55a44495a18445 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 12 Nov 2021 17:12:14 +0000 Subject: packagegroup-core-full-cmdline: Drop compatibility mappings The task-core namespace was dropped years ago and we've had the compatibility mappings for a long time. We should no longer need them as everyone should long since have adapted. (From OE-Core rev: 5b3606d3567eb87a9685e5de3437603b1a2d3569) Signed-off-by: Richard Purdie --- .../packagegroup-core-full-cmdline.bb | 35 ---------------------- 1 file changed, 35 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index c0647b2188..b66617fbf6 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -18,41 +18,6 @@ PACKAGES = "\ packagegroup-core-full-cmdline-sys-services \ " -python __anonymous () { - # For backwards compatibility after rename - namemap = {} - namemap["packagegroup-core-full-cmdline"] = "packagegroup-core-basic" - namemap["packagegroup-core-full-cmdline-utils"] = "packagegroup-core-basic-utils" - namemap["packagegroup-core-full-cmdline-extended"] = "packagegroup-core-basic-extended" - namemap["packagegroup-core-full-cmdline-dev-utils"] = "packagegroup-core-dev-utils" - namemap["packagegroup-core-full-cmdline-multiuser"] = "packagegroup-core-multiuser" - namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" - 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(pkg2[:-4], None) - if mapped: - mapped += '-dev' - elif pkg.endswith('-dbg'): - mapped = namemap.get(pkg2[:-4], None) - if mapped: - mapped += '-dbg' - else: - mapped = namemap.get(pkg2, None) - - if mapped: - oldtaskname = mapped.replace("packagegroup-core", "task-core") - 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) -} - - RDEPENDS:packagegroup-core-full-cmdline = "\ packagegroup-core-full-cmdline-utils \ packagegroup-core-full-cmdline-extended \ -- cgit v1.2.3-54-g00ecf