On 06/17/2019 11:54 PM, Richard Purdie wrote:
On Mon, 2019-06-17 at 17:24 +0800, Chen Qi wrote:
TOOLCHAIN_OUTPUTNAME could be overridden. So use this variable directly
instead of its default value ${SDK_NAME}-toolchain-${SDK_VERSION}.
Signed-off-by: Chen Qi <[email protected]>
---
meta/lib/oeqa/selftest/cases/manifest.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/manifest.py
b/meta/lib/oeqa/selftest/cases/manifest.py
index c0b25ab..5d13f35 100644
--- a/meta/lib/oeqa/selftest/cases/manifest.py
+++ b/meta/lib/oeqa/selftest/cases/manifest.py
@@ -86,11 +86,8 @@ class VerifyManifest(OESelftestTestCase):
try:
mdir = self.get_dir_from_bb_var('SDK_DEPLOY', self.buildtarget)
for k in d_target.keys():
- bb_vars = get_bb_vars(['SDK_NAME', 'SDK_VERSION'],
self.buildtarget)
- mfilename[k] = "{}-toolchain-{}.{}.manifest".format(
- bb_vars['SDK_NAME'],
- bb_vars['SDK_VERSION'],
- k)
+ toolchain_outputname = get_bb_var('TOOLCHAIN_OUTPUTNAME',
self.buildtarget)
+ mfilename[k] = "{}.{}.manifest".format(toolchain_outputname, k)
Whilst I agree there is a problem here, this code is iterating over
multiple targets. Isn't TOOLCHAIN_OUTPUTNAME only going to be correct
for one of them?
Cheers,
Richard
This code is iterating over d_target.keys(), which is 'target' and
'host'. And the TOOLCHAIN_OUTPUTNAME is for self.buildtarget, which is
core-image-minimal. Thus, we are basically checking
${TOOLCHAIN_OUTPUTNAME}.target.manifest and
${TOOLCHAIN_OUTPUTNAME}.host.target.
e.g.
tmp-glibc/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-qemux86-64-toolchain-2.7+snapshot.host.manifest
tmp-glibc/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-qemux86-64-toolchain-2.7+snapshot.target.manifest
So I think things are correct.
Best Regards,
Chen Qi
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
