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>
This commit is contained in:
parent
af49a09eee
commit
99006ef296
|
@ -41,12 +41,12 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
|
||||||
'mount -L testrootfs /mnt/testrootfs',
|
'mount -L testrootfs /mnt/testrootfs',
|
||||||
'rm -rf /mnt/testrootfs/*',
|
'rm -rf /mnt/testrootfs/*',
|
||||||
'tar xzvf ~/test-rootfs.tar.gz -C /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:
|
for _, dtbfn in self.dtbs:
|
||||||
# Kernel and dtb files may not be in the image, so copy them if not
|
# 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:
|
if not self.serialcontrol_cmd:
|
||||||
bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")
|
bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")
|
||||||
|
|
Loading…
Reference in New Issue