diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-28 11:49:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-29 10:58:54 +0100 |
| commit | 0007b5c5967536131246970e7d55602e52a87e95 (patch) | |
| tree | 57c9c5e2d1ee25b351ae1adfd10c035967c40bf4 /meta/classes/testimage.bbclass | |
| parent | 515a8b790e08a48aaf64a6b7237e2b39390e35f6 (diff) | |
| download | openembedded-core-contrib-0007b5c5967536131246970e7d55602e52a87e95.tar.gz | |
testimage: Fix sdk test manifest handling
Fix SDK_MANIFEST -> SDK_TARGET_MANIFEST and add support for host
version too which is useful in SDK QA tests.
(From OE-Core rev: df91dd8d064dc3e59c7f057d3f869500a233a76f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testimage.bbclass')
| -rw-r--r-- | meta/classes/testimage.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index dc163c7313..1557675eec 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -287,12 +287,18 @@ def testsdk_main(d): self.sdkenv = sdkenv self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split() self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split() - manifest = os.path.join(d.getVar("SDK_MANIFEST", True)) + manifest = d.getVar("SDK_TARGET_MANIFEST", True) try: with open(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) + hostmanifest = d.getVar("SDK_HOST_MANIFEST", True) + try: + with open(hostmanifest) 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) # test context tc = TestContext() |