diff options
| author |   Aníbal Limón <limon.anibal@gmail.com> | 2016-01-31 09:21:14 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-10 15:51:03 +0000 |
| commit | 2310d5ad03531b7e1f9572c12c83c2fedc0291c9 (patch) | |
| tree | 9730dd8cfa31e28495ad0959fbe1ffac854ef3b1 /meta | |
| parent | f3781544a5c077610498a6b7dc5244ee4c5bc6df (diff) | |
| download | openembedded-core-contrib-2310d5ad03531b7e1f9572c12c83c2fedc0291c9.tar.gz | |
classes/populate_sdk_ext: Add SDK_EXT_TARGET_MANIFEST and SDK_EXT_HOST_MANIFEST
Extensible SDK needs to point to the correct manifest so add
SDK_EXT_TARGET_MANIFEST and SDK_EXT_HOST_MANIFEST variables.
oeqa/oetest.py: Fix SDKExtTestContext for load the correct manifests.
Signed-off-by: Aníbal Limón <limon.anibal@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/oetest.py | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 79a4685834..6e3664257d 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -51,6 +51,9 @@ B_task-populate-sdk-ext = "${SDK_DIR}" TOOLCHAINEXT_OUTPUTNAME = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${TOOLCHAINEXT_OUTPUTNAME}" +SDK_EXT_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.target.manifest" +SDK_EXT_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest" + SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK" python copy_buildsystem () { diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index 620617c4fb..80b40b6fa9 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -382,14 +382,18 @@ class SDKTestContext(TestContext): self.sdktestdir = sdktestdir self.sdkenv = sdkenv + if not hasattr(self, 'target_manifest'): + self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True) try: - with open(d.getVar("SDK_TARGET_MANIFEST", True)) as f: + with open(self.target_manifest) as f: self.pkgmanifest = f.read() except IOError as e: bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e) + if not hasattr(self, 'host_manifest'): + self.host_manifest = d.getVar("SDK_HOST_MANIFEST", True) try: - with open(d.getVar("SDK_HOST_MANIFEST", True)) as f: + with open(self.host_manifest) as f: self.hostpkgmanifest = f.read() except IOError as e: bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e) @@ -406,6 +410,9 @@ class SDKTestContext(TestContext): class SDKExtTestContext(SDKTestContext): def __init__(self, d, sdktestdir, sdkenv): + self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True) + self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True) + super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv) self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath( |