diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 11:27:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 15:12:31 +0100 |
| commit | d2fbc55d6863a767e69092bac686c02c3ec34650 (patch) | |
| tree | 02c49cd7d866f067bb3834e38bb35aae1ca1000a | |
| parent | 5cf12b20c08d927af8b1a4e2997d325a030c2269 (diff) | |
| download | openembedded-core-contrib-d2fbc55d6863a767e69092bac686c02c3ec34650.tar.gz | |
populate_sdk_base: Remap TOOLCHAIN_HOST_TASK variable
Currently this variable isn't passed through the magic rename
mangling. This means that if you try adding "nativesdk-eglibc"
to an image directly, you can't since the package is renamed
by debian.bbclass and nothing sees the renaming.
This is annoying since I wanted to exactly that. This code
change passes it through the standard renaming function, the
tricky part is that we have to set PKGDATA_DIR to point to
the correct sysroot during the call. We create a copy of the
datastore for the purposes of the call to do this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index db64d3abc8..abfcdc7744 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -72,6 +72,13 @@ fakeroot python do_populate_sdk() { runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d) runtime_mapping_rename("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY", pn, d) + ld = bb.data.createCopy(d) + ld.setVar("PKGDATA_DIR", "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}/pkgdata") + runtime_mapping_rename("TOOLCHAIN_HOST_TASK", pn, ld) + runtime_mapping_rename("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", pn, ld) + d.setVar("TOOLCHAIN_HOST_TASK", ld.getVar("TOOLCHAIN_HOST_TASK", True)) + d.setVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", ld.getVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", True)) + # create target/host SDK manifests create_manifest(d, manifest_dir=d.getVar('SDK_DIR', True), manifest_type=Manifest.MANIFEST_TYPE_SDK_HOST) |