mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

classes/populate_sdk_ext: Add SDK_EXT_TARGET_MANIFEST and SDK_EXT_HOST_MANIFEST

Browse Source 
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>
This commit is contained in:
Aníbal Limón
2016-01-31 09:21:14 -06:00
committed by Richard Purdie
parent 4cfdf174ce
commit 062dbd6da7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/populate_sdk_ext.bbclass
+3
View File
@@ -51,6 +51,9 @@ B_task-populate-sdk-ext = "${SDK_DIR}"
TOOLCHAINEXT_OUTPUTNAME = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" TOOLCHAINEXT_OUTPUTNAME = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}"
TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${TOOLCHAINEXT_OUTPUTNAME}" 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" SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK"
python copy_buildsystem () { python copy_buildsystem () {
meta/lib/oeqa/oetest.py
+9 -2
View File
@@ -382,14 +382,18 @@ class SDKTestContext(TestContext):
self.sdktestdir = sdktestdir self.sdktestdir = sdktestdir
self.sdkenv = sdkenv self.sdkenv = sdkenv
if not hasattr(self, 'target_manifest'):
self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True)
try: try:
with open(d.getVar("SDK_TARGET_MANIFEST", True)) as f: with open(self.target_manifest) as f:
self.pkgmanifest = f.read() self.pkgmanifest = f.read()
except IOError as e: except IOError as e:
bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % 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: try:
with open(d.getVar("SDK_HOST_MANIFEST", True)) as f: with open(self.host_manifest) as f:
self.hostpkgmanifest = f.read() self.hostpkgmanifest = f.read()
except IOError as e: except IOError as e:
bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % 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): class SDKExtTestContext(SDKTestContext):
def __init__(self, d, sdktestdir, sdkenv): 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) super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv)
self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath( self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(