package.bbclass: Drop EXPORT_FUNCTIONS use against mapping_rename_hook

The usage of this function renaming and it being called using
bb.build.exec_func() causes needless indirection loops, confusing log
files and seems generally pointless.

This simplification makes the process much simpler and faster. I can't
come up with a good reason why the export_functions functionality is
needed for this function.

(From OE-Core rev: 74daad03ca29a03b0005f7d2b90a0347d5b583a5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-05-10 09:24:22 +01:00
parent a50af4d540
commit a246af9bf7
4 changed files with 4 additions and 6 deletions

View File

@ -1788,7 +1788,7 @@ addtask package_write before do_build after do_package
# Helper functions for the package writing classes
#
python package_mapping_rename_hook () {
def mapping_rename_hook(d):
"""
Rewrite variables to account for package renaming in things
like debian.bbclass or manual PKG variable name changes
@ -1799,6 +1799,4 @@ python package_mapping_rename_hook () {
runtime_mapping_rename("RPROVIDES", d)
runtime_mapping_rename("RREPLACES", d)
runtime_mapping_rename("RCONFLICTS", d)
}
EXPORT_FUNCTIONS mapping_rename_hook

View File

@ -330,7 +330,7 @@ python do_package_deb () {
raise bb.build.FuncFailed("Missing field for deb generation: %s" % value)
# more fields
bb.build.exec_func("mapping_rename_hook", localdata)
mapping_rename_hook(localdata)
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
for dep in rdepends:

View File

@ -367,7 +367,7 @@ python do_package_ipk () {
raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value)
# more fields
bb.build.exec_func("mapping_rename_hook", localdata)
mapping_rename_hook(localdata)
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")

View File

@ -700,7 +700,7 @@ python write_specfile () {
translate_vers('RCONFLICTS', localdata)
# Map the dependencies into their final form
bb.build.exec_func("mapping_rename_hook", localdata)
mapping_rename_hook(localdata)
splitrdepends = strip_multilib(localdata.getVar('RDEPENDS', True), d) or ""
splitrrecommends = strip_multilib(localdata.getVar('RRECOMMENDS', True), d) or ""