Previously this class copied the uninative tarball to a certain directory in the
assumption that is where uninative.bbclass is looking for it. However as this
is a variable in uninative.bbclass that can be changed, specify exactly where
the tarball is in the eSDK local.conf.
Also don't use string formatting to write the INHERIT for no reason.
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta/classes/populate_sdk_ext.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index 74d12eb..8d199f4 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -193,7 +193,9 @@ python copy_buildsystem () {
# Write a newline just in case there's none at the end of the
original
f.write('\n')
- f.write('INHERIT += "%s"\n\n' % 'uninative')
+ f.write('INHERIT += "uninative"\n')
+ f.write('UNINATIVE_DLDIR = "${COREBASE}"\n\n')
+
f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION',
False))
# Some classes are not suitable for SDK, remove them from INHERIT
@@ -368,7 +370,7 @@ sdk_ext_postinst() {
# Warn if trying to use external bitbake and the ext SDK together
echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to
use the extensible SDK in an environment set up to run bitbake - this may lead
to unexpected results. Please source this script in a new shell session
instead.') || true" >> $env_setup_script
- # For now this is where uninative.bbclass expects the tarball
+ # We configure uninative.bbclass in local.conf to look in ${COREBASE}
for the tarball
mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname
${oe_init_build_env_path}`
if [ "$prepare_buildsystem" != "no" -a -n
"${@SDK_INSTALL_TARGETS.strip()}" ]; then
--
2.7.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
