summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <limon.anibal@gmail.com>2016-01-31 09:21:14 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 16:06:23 +0000
commit062dbd6da768c5613e428ada86342c7be4377a1b (patch)
tree100a4d8808244691300446fb70c9c4956df3d9bd /meta
parent4cfdf174cee1c9e2c012d8c17d029477db5841e2 (diff)
downloadpoky-062dbd6da768c5613e428ada86342c7be4377a1b.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. (From OE-Core rev: 2310d5ad03531b7e1f9572c12c83c2fedc0291c9) Signed-off-by: Aníbal Limón <limon.anibal@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass3
-rw-r--r--meta/lib/oeqa/oetest.py11
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}"
51TOOLCHAINEXT_OUTPUTNAME = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" 51TOOLCHAINEXT_OUTPUTNAME = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}"
52TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${TOOLCHAINEXT_OUTPUTNAME}" 52TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${TOOLCHAINEXT_OUTPUTNAME}"
53 53
54SDK_EXT_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.target.manifest"
55SDK_EXT_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"
56
54SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK" 57SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK"
55 58
56python copy_buildsystem () { 59python 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):
382 self.sdktestdir = sdktestdir 382 self.sdktestdir = sdktestdir
383 self.sdkenv = sdkenv 383 self.sdkenv = sdkenv
384 384
385 if not hasattr(self, 'target_manifest'):
386 self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True)
385 try: 387 try:
386 with open(d.getVar("SDK_TARGET_MANIFEST", True)) as f: 388 with open(self.target_manifest) as f:
387 self.pkgmanifest = f.read() 389 self.pkgmanifest = f.read()
388 except IOError as e: 390 except IOError as e:
389 bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e) 391 bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e)
390 392
393 if not hasattr(self, 'host_manifest'):
394 self.host_manifest = d.getVar("SDK_HOST_MANIFEST", True)
391 try: 395 try:
392 with open(d.getVar("SDK_HOST_MANIFEST", True)) as f: 396 with open(self.host_manifest) as f:
393 self.hostpkgmanifest = f.read() 397 self.hostpkgmanifest = f.read()
394 except IOError as e: 398 except IOError as e:
395 bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e) 399 bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e)
@@ -406,6 +410,9 @@ class SDKTestContext(TestContext):
406 410
407class SDKExtTestContext(SDKTestContext): 411class SDKExtTestContext(SDKTestContext):
408 def __init__(self, d, sdktestdir, sdkenv): 412 def __init__(self, d, sdktestdir, sdkenv):
413 self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True)
414 self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True)
415
409 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv) 416 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv)
410 417
411 self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath( 418 self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(