diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-04 13:18:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-05 11:52:50 +0000 |
commit | a099ed2125fbd822342b7fc124e3c659b26d29c9 (patch) | |
tree | d62cbc302f02f2e692acfc61cc7f0fad0d7bab81 /meta/classes-recipe/populate_sdk_base.bbclass | |
parent | 93be2cdf492e1ec3d3c13f9c2ce82346be323da6 (diff) | |
download | poky-a099ed2125fbd822342b7fc124e3c659b26d29c9.tar.gz |
package: Move pkgdata handling functions to oe.packagedata
To avoid reparsing the bbclass code all the time, move the functions
to the packagedata python function library code which is more efficient.
(From OE-Core rev: f520a3039540b1183b1b2bdaaf8b9195995c0187)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/populate_sdk_base.bbclass')
-rw-r--r-- | meta/classes-recipe/populate_sdk_base.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 917619962c..7cc9535356 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass | |||
@@ -162,6 +162,7 @@ SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; archive_sdk; $ | |||
162 | def populate_sdk_common(d): | 162 | def populate_sdk_common(d): |
163 | from oe.sdk import populate_sdk | 163 | from oe.sdk import populate_sdk |
164 | from oe.manifest import create_manifest, Manifest | 164 | from oe.manifest import create_manifest, Manifest |
165 | import oe.packagedata | ||
165 | 166 | ||
166 | # Handle package exclusions | 167 | # Handle package exclusions |
167 | excl_pkgs = (d.getVar("PACKAGE_EXCLUDE") or "").split() | 168 | excl_pkgs = (d.getVar("PACKAGE_EXCLUDE") or "").split() |
@@ -184,13 +185,13 @@ def populate_sdk_common(d): | |||
184 | d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", ' '.join(inst_attempt_pkgs)) | 185 | d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", ' '.join(inst_attempt_pkgs)) |
185 | 186 | ||
186 | pn = d.getVar('PN') | 187 | pn = d.getVar('PN') |
187 | runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d) | 188 | oe.packagedata.runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d) |
188 | runtime_mapping_rename("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY", pn, d) | 189 | oe.packagedata.runtime_mapping_rename("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY", pn, d) |
189 | 190 | ||
190 | ld = bb.data.createCopy(d) | 191 | ld = bb.data.createCopy(d) |
191 | ld.setVar("PKGDATA_DIR", "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}/pkgdata") | 192 | ld.setVar("PKGDATA_DIR", "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}/pkgdata") |
192 | runtime_mapping_rename("TOOLCHAIN_HOST_TASK", pn, ld) | 193 | oe.packagedata.runtime_mapping_rename("TOOLCHAIN_HOST_TASK", pn, ld) |
193 | runtime_mapping_rename("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", pn, ld) | 194 | oe.packagedata.runtime_mapping_rename("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", pn, ld) |
194 | d.setVar("TOOLCHAIN_HOST_TASK", ld.getVar("TOOLCHAIN_HOST_TASK")) | 195 | d.setVar("TOOLCHAIN_HOST_TASK", ld.getVar("TOOLCHAIN_HOST_TASK")) |
195 | d.setVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", ld.getVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY")) | 196 | d.setVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", ld.getVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY")) |
196 | 197 | ||