From d5deca211b344c8077b3e5f8669690b242480423 Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Fri, 6 Jun 2014 21:24:41 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'meta-yocto-bsp/lib') 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 class BeagleBoneTarget(MasterImageHardwareTarget): + dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'} + + @classmethod + def get_extra_files(self): + return list(self.dtbs.keys()) + def __init__(self, d): super(BeagleBoneTarget, self).__init__(d) - self.dtbs = [('uImage-am335x-bone.dtb', 'am335x-bone.dtb'), - ('uImage-am335x-boneblack.dtb', 'am335x-boneblack.dtb')] - self.deploy_cmds = [ 'mkdir -p /mnt/testrootfs', 'mount -L testrootfs /mnt/testrootfs', @@ -44,7 +47,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget): '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', ] - for _, dtbfn in self.dtbs: + for _, dtbfn in self.dtbs.iteritems(): # Kernel and dtb files may not be in the image, so copy them if not self.deploy_cmds.append('[ -e /mnt/testrootfs/boot/{0} ] || cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn)) @@ -58,7 +61,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget): # Kernel and dtb files may not be in the image, so copy them just in case self.master.copy_to(self.kernel, "~/test-kernel") kernelpath = os.path.dirname(self.kernel) - for dtborig, dtbfn in self.dtbs: + for dtborig, dtbfn in self.dtbs.iteritems(): dtbfile = os.path.join(kernelpath, dtborig) if os.path.exists(dtbfile): self.master.copy_to(dtbfile, "~/%s" % dtbfn) -- cgit v1.2.3-54-g00ecf