summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/lib/oeqa/controllers
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-06 21:24:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 11:45:15 +0100
commitd5deca211b344c8077b3e5f8669690b242480423 (patch)
treee5ecf3b69ae669a14d8ae49d301fa8e21bce60ef /meta-yocto-bsp/lib/oeqa/controllers
parente105c82203161da9d7441ee96de8506cb1dc7504 (diff)
downloadpoky-d5deca211b344c8077b3e5f8669690b242480423.tar.gz
beaglebonetarget.py: Add support for get_extra_files() classmethod
[YOCTO #6254] Adding support for the get_extra_files() method to the BeagleBoneTarget class. (From meta-yocto rev: b719ff579fe2a5f5a0d19a9091eaa37e0f145384) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/controllers')
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 0d148d7b4f..86b638c896 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -30,12 +30,15 @@ from oeqa.controllers.masterimage import MasterImageHardwareTarget
30 30
31class BeagleBoneTarget(MasterImageHardwareTarget): 31class BeagleBoneTarget(MasterImageHardwareTarget):
32 32
33 dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'}
34
35 @classmethod
36 def get_extra_files(self):
37 return list(self.dtbs.keys())
38
33 def __init__(self, d): 39 def __init__(self, d):
34 super(BeagleBoneTarget, self).__init__(d) 40 super(BeagleBoneTarget, self).__init__(d)
35 41
36 self.dtbs = [('uImage-am335x-bone.dtb', 'am335x-bone.dtb'),
37 ('uImage-am335x-boneblack.dtb', 'am335x-boneblack.dtb')]
38
39 self.deploy_cmds = [ 42 self.deploy_cmds = [
40 'mkdir -p /mnt/testrootfs', 43 'mkdir -p /mnt/testrootfs',
41 'mount -L testrootfs /mnt/testrootfs', 44 'mount -L testrootfs /mnt/testrootfs',
@@ -44,7 +47,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
44 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', 47 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage',
45 ] 48 ]
46 49
47 for _, dtbfn in self.dtbs: 50 for _, dtbfn in self.dtbs.iteritems():
48 # Kernel and dtb files may not be in the image, so copy them if not 51 # Kernel and dtb files may not be in the image, so copy them if not
49 self.deploy_cmds.append('[ -e /mnt/testrootfs/boot/{0} ] || cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn)) 52 self.deploy_cmds.append('[ -e /mnt/testrootfs/boot/{0} ] || cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn))
50 53
@@ -58,7 +61,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
58 # Kernel and dtb files may not be in the image, so copy them just in case 61 # Kernel and dtb files may not be in the image, so copy them just in case
59 self.master.copy_to(self.kernel, "~/test-kernel") 62 self.master.copy_to(self.kernel, "~/test-kernel")
60 kernelpath = os.path.dirname(self.kernel) 63 kernelpath = os.path.dirname(self.kernel)
61 for dtborig, dtbfn in self.dtbs: 64 for dtborig, dtbfn in self.dtbs.iteritems():
62 dtbfile = os.path.join(kernelpath, dtborig) 65 dtbfile = os.path.join(kernelpath, dtborig)
63 if os.path.exists(dtbfile): 66 if os.path.exists(dtbfile):
64 self.master.copy_to(dtbfile, "~/%s" % dtbfn) 67 self.master.copy_to(dtbfile, "~/%s" % dtbfn)