From 1655fe2eae631ab81355222ad0207dab2b47ba86 Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Fri, 6 Jun 2014 21:24:42 +0300 Subject: controllers/beaglebonetarget.py: enable dynamical determination of rootfs type [YOCTO #6375] (From meta-yocto rev: 953b51b2ba5862ad24e2ad4f6cf9cefff7af14c9) Signed-off-by: Corneliu Stoicescu Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-yocto-bsp') 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): 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) -- cgit 1.2.3-korg