Sometimes the rootfs archive contains the kernel file (core-image-full-cmdline)
or the dtbs files (core-image-sato). Adding verification to add them if they
don't allready exist.
Without this, the first condition would fail and the image deploy task would
stop.
Signed-off-by: Corneliu Stoicescu <corneliux.stoice...@intel.com>
---
meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 4 ++--
1 file 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..af56bda 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',
+ 'if [ ! -e /mnt/testrootfs/boot/uImage ]; then cp
~/test-kernel /mnt/testrootfs/boot/uImage; fi',
]
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('if [ ! -e /mnt/testrootfs/boot/{0} ];
then cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn) + '; fi')
if not self.serialcontrol_cmd:
bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined
in local.conf.")
--
1.8.3.2
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
