summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-06 22:14:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 12:52:21 +0100
commit5456f0e58ebf07a9a639381caddf2d616623c190 (patch)
treecc1de16adf159417b5f454505cc5c9e042226e2b
parent4bc02066c0b70e2815e9566f174a56e22e95b76d (diff)
downloadpoky-5456f0e58ebf07a9a639381caddf2d616623c190.tar.gz
controllers/masterimage.py: Make testimage kernel naming pattern universal
YB: #6254 The QemuTargetControl class does not specify any kernel naming but the runqemu script it uses uses the " KERNEL_IMAGETYPE + MACHINE + '.bin' " naming scheme. Modifying the other major target controller class, MasterImageHardwareTarget, to use the same kernel naming scheme. This is usefull also to outside scripts that want to anticipate the kernel file name for all target controllers. (From OE-Core rev: e8666e91a9633da6a560d5a9510bb53d0251b16d) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/controllers/masterimage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index b03c5bf74b..311f0cf68c 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -52,7 +52,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget):
52 # test rootfs + kernel 52 # test rootfs + kernel
53 self.image_fstype = self.get_image_fstype(d) 53 self.image_fstype = self.get_image_fstype(d)
54 self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) 54 self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype)
55 self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE")) 55 self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE") + '-' + d.getVar('MACHINE') + '.bin')
56 if not os.path.isfile(self.rootfs): 56 if not os.path.isfile(self.rootfs):
57 # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be 57 # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be
58 # the same as the config with which the image was build, ie 58 # the same as the config with which the image was build, ie