From 99006ef296369c0fa7a40b83ef84b01d438fe98a Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Mon, 2 Jun 2014 11:37:33 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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 53f454bc6a..0d148d7b4f 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): 'mount -L testrootfs /mnt/testrootfs', 'rm -rf /mnt/testrootfs/*', 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs', - '[ ! -e /mnt/testrootfs/boot/uImage ] && cp ~/test-kernel /mnt/testrootfs/boot/uImage', + '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', ] for _, dtbfn in self.dtbs: # 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)) + self.deploy_cmds.append('[ -e /mnt/testrootfs/boot/{0} ] || cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn)) if not self.serialcontrol_cmd: bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.") -- cgit v1.2.3-54-g00ecf