From: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Date: Fri, 6 Jun 2014 18:24:42 +0000 (+0300)
Subject: controllers/beaglebonetarget.py: enable dynamical determination of rootfs type
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=953b51b2ba5862ad24e2ad4f6cf9cefff7af14c9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

controllers/beaglebonetarget.py: enable dynamical determination of rootfs type

[YOCTO #6375]

Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 86b638c8967..b2e905078e0 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):
     def __init__(self, d):
         super(BeagleBoneTarget, self).__init__(d)
 
+        self.image_fstype = self.get_image_fstype(d)
         self.deploy_cmds = [
                 'mkdir -p /mnt/testrootfs',
                 'mount -L testrootfs /mnt/testrootfs',
                 'rm -rf /mnt/testrootfs/*',
-                'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs',
+                'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype,
                 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage',
                 ]
 
@@ -65,7 +66,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
             dtbfile = os.path.join(kernelpath, dtborig)
             if os.path.exists(dtbfile):
                 self.master.copy_to(dtbfile, "~/%s" % dtbfn)
-        self.master.copy_to(self.rootfs, "~/test-rootfs.tar.gz")
+        self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
         for cmd in self.deploy_cmds:
             self.master.run(cmd)