summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-02 08:37:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-03 09:38:24 (GMT)
commit99006ef296369c0fa7a40b83ef84b01d438fe98a (patch)
treea6b232ae98caf8ba5ad0c30e8c45212d9f942afd /meta-yocto-bsp
parentaf49a09eee329946330c8e2652a84e1c8a2bd2dd (diff)
downloadpoky-99006ef296369c0fa7a40b83ef84b01d438fe98a.tar.gz
oeqa/controllers/beaglebonetarget.py: fix conditions for files copied to /boot
Using '[ ! -e /mnt/testrootfs/boot/uImage ] && cp ~/test-kernel /mnt/testrootfs/boot/uImage' would result in exit code 1 if the first condition is not met. Changing the code to return exit status 0 if /mnt/testrootfs/boot/uImage exists. Also adding this change to dtb files check. (From meta-yocto rev: e06e354165673bfb6b531d1f78c468b4c56dbd18) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 53f454b..0d148d7 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -41,12 +41,12 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
41 'mount -L testrootfs /mnt/testrootfs', 41 'mount -L testrootfs /mnt/testrootfs',
42 'rm -rf /mnt/testrootfs/*', 42 'rm -rf /mnt/testrootfs/*',
43 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs', 43 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs',
44 '[ ! -e /mnt/testrootfs/boot/uImage ] && cp ~/test-kernel /mnt/testrootfs/boot/uImage', 44 '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage',
45 ] 45 ]
46 46
47 for _, dtbfn in self.dtbs: 47 for _, dtbfn in self.dtbs:
48 # Kernel and dtb files may not be in the image, so copy them if not 48 # 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)) 49 self.deploy_cmds.append('[ -e /mnt/testrootfs/boot/{0} ] || cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn))
50 50
51 if not self.serialcontrol_cmd: 51 if not self.serialcontrol_cmd:
52 bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.") 52 bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")