From 99de12f152413c1cb942eac26082d6795a285151 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Jan 2023 14:20:37 +0000 Subject: package: Move mapping_rename_hook to packagedata function library This function is used by the packaging tasks/classes and makes much more sense in the packagedata function library. (From OE-Core rev: 7a512a8803101310772d83836e6b78ebaf8121de) Signed-off-by: Richard Purdie --- meta/classes-global/package.bbclass | 13 ------------- meta/classes-global/package_deb.bbclass | 2 +- meta/classes-global/package_ipk.bbclass | 2 +- meta/classes-global/package_rpm.bbclass | 2 +- meta/lib/oe/packagedata.py | 10 +++++++++- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index 5c250776f8..d334da6fb3 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -607,16 +607,3 @@ python do_packagedata_setscene () { } addtask do_packagedata_setscene -# -# Helper functions for the package writing classes -# - -def mapping_rename_hook(d): - """ - Rewrite variables to account for package renaming in things - like debian.bbclass or manual PKG variable name changes - """ - pkg = d.getVar("PKG") - oe.packagedata.runtime_mapping_rename("RDEPENDS", pkg, d) - oe.packagedata.runtime_mapping_rename("RRECOMMENDS", pkg, d) - oe.packagedata.runtime_mapping_rename("RSUGGESTS", pkg, d) diff --git a/meta/classes-global/package_deb.bbclass b/meta/classes-global/package_deb.bbclass index 99e377b455..5aba3837bd 100644 --- a/meta/classes-global/package_deb.bbclass +++ b/meta/classes-global/package_deb.bbclass @@ -174,7 +174,7 @@ def deb_write_pkg(pkg, d): ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n") - mapping_rename_hook(localdata) + oe.packagedata.mapping_rename_hook(localdata) def debian_cmp_remap(var): # dpkg does not allow for '(', ')' or ':' in a dependency name diff --git a/meta/classes-global/package_ipk.bbclass b/meta/classes-global/package_ipk.bbclass index 9b75f5cf1c..b4b7bc9ac2 100644 --- a/meta/classes-global/package_ipk.bbclass +++ b/meta/classes-global/package_ipk.bbclass @@ -167,7 +167,7 @@ def ipk_write_pkg(pkg, d): ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n") - mapping_rename_hook(localdata) + oe.packagedata.mapping_rename_hook(localdata) def debian_cmp_remap(var): # In debian '>' and '<' do not mean what it appears they mean diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 16631688b1..85d0bd7fce 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -365,7 +365,7 @@ python write_specfile () { translate_vers('RCONFLICTS', localdata) # Map the dependencies into their final form - mapping_rename_hook(localdata) + oe.packagedata.mapping_rename_hook(localdata) splitrdepends = localdata.getVar('RDEPENDS') or "" splitrrecommends = localdata.getVar('RRECOMMENDS') or "" diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index efa600ddcd..162ff60d72 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py @@ -340,4 +340,12 @@ fi and not bb.data.inherits_class('packagegroup', d): write_extra_runtime_pkgs(global_variants, packages, pkgdatadir) - +def mapping_rename_hook(d): + """ + Rewrite variables to account for package renaming in things + like debian.bbclass or manual PKG variable name changes + """ + pkg = d.getVar("PKG") + oe.packagedata.runtime_mapping_rename("RDEPENDS", pkg, d) + oe.packagedata.runtime_mapping_rename("RRECOMMENDS", pkg, d) + oe.packagedata.runtime_mapping_rename("RSUGGESTS", pkg, d) -- cgit v1.2.3-54-g00ecf