summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-06 21:24:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 11:45:16 +0100
commit1655fe2eae631ab81355222ad0207dab2b47ba86 (patch)
treecbfe1b903abb76de35490f0cdbf378dbf6609d2a
parentd5deca211b344c8077b3e5f8669690b242480423 (diff)
downloadpoky-1655fe2eae631ab81355222ad0207dab2b47ba86.tar.gz
controllers/beaglebonetarget.py: enable dynamical determination of rootfs type
[YOCTO #6375] (From meta-yocto rev: 953b51b2ba5862ad24e2ad4f6cf9cefff7af14c9) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 86b638c896..b2e905078e 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -39,11 +39,12 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
39 def __init__(self, d): 39 def __init__(self, d):
40 super(BeagleBoneTarget, self).__init__(d) 40 super(BeagleBoneTarget, self).__init__(d)
41 41
42 self.image_fstype = self.get_image_fstype(d)
42 self.deploy_cmds = [ 43 self.deploy_cmds = [
43 'mkdir -p /mnt/testrootfs', 44 'mkdir -p /mnt/testrootfs',
44 'mount -L testrootfs /mnt/testrootfs', 45 'mount -L testrootfs /mnt/testrootfs',
45 'rm -rf /mnt/testrootfs/*', 46 'rm -rf /mnt/testrootfs/*',
46 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs', 47 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype,
47 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', 48 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage',
48 ] 49 ]
49 50
@@ -65,7 +66,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
65 dtbfile = os.path.join(kernelpath, dtborig) 66 dtbfile = os.path.join(kernelpath, dtborig)
66 if os.path.exists(dtbfile): 67 if os.path.exists(dtbfile):
67 self.master.copy_to(dtbfile, "~/%s" % dtbfn) 68 self.master.copy_to(dtbfile, "~/%s" % dtbfn)
68 self.master.copy_to(self.rootfs, "~/test-rootfs.tar.gz") 69 self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
69 for cmd in self.deploy_cmds: 70 for cmd in self.deploy_cmds:
70 self.master.run(cmd) 71 self.master.run(cmd)
71 72