summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-28 11:27:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-28 15:12:45 +0100
commit859ad9402c25ed6ad34938ddb9deff706dfd81c2 (patch)
tree0abdc4908845a17390dcd05b7b360f1a927b872a /meta/classes
parenta9c628d0337a8b47e26e5314a8dea0409abcf2df (diff)
downloadpoky-859ad9402c25ed6ad34938ddb9deff706dfd81c2.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. (From OE-Core rev: d2fbc55d6863a767e69092bac686c02c3ec34650) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_base.bbclass7
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() {
72 runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d) 72 runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d)
73 runtime_mapping_rename("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY", pn, d) 73 runtime_mapping_rename("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY", pn, d)
74 74
75 ld = bb.data.createCopy(d)
76 ld.setVar("PKGDATA_DIR", "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}/pkgdata")
77 runtime_mapping_rename("TOOLCHAIN_HOST_TASK", pn, ld)
78 runtime_mapping_rename("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", pn, ld)
79 d.setVar("TOOLCHAIN_HOST_TASK", ld.getVar("TOOLCHAIN_HOST_TASK", True))
80 d.setVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", ld.getVar("TOOLCHAIN_HOST_TASK_ATTEMPTONLY", True))
81
75 # create target/host SDK manifests 82 # create target/host SDK manifests
76 create_manifest(d, manifest_dir=d.getVar('SDK_DIR', True), 83 create_manifest(d, manifest_dir=d.getVar('SDK_DIR', True),
77 manifest_type=Manifest.MANIFEST_TYPE_SDK_HOST) 84 manifest_type=Manifest.MANIFEST_TYPE_SDK_HOST)