aboutsummaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/lib/oeqa/controllers
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-07-11 19:03:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 14:56:49 +0100
commitd66c567b111335e1ad5c63fa5b3dde7fa2d4f00f (patch)
treed8d8d52f124afd2195ce98edaf50156b1ad945c1 /meta-yocto-bsp/lib/oeqa/controllers
parent929e48e0af0aae503fa883d7765400c3f38cf2d9 (diff)
downloadpoky-d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f.tar.gz
poky-d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f.tar.bz2
poky-d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f.zip
oeqa/controllers/beaglebonetarget.py: fix deploy when kernel file is a broken link
Sometimes the uncompressed rootfs image contains boot/uImage but if it's a symlink, it seems broken from the master image's point of view. Because [ -e /mnt/testrootfs/boot/uImage ] will return 1, it will proceed to copy the backup kernel file over it but cp ~/test-kernel /mnt/testrootfs/boot/uImage will also fail with: cp: not writing through dangling symlink Adding a new check here, if the boot/uImage is a link, leave it as is. (From meta-yocto rev: 849b1e319a84a710259223f57b2e4c74bc64fe75) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/controllers')
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index b2e905078e..0f1aeb398f 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -45,7 +45,7 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
'mount -L testrootfs /mnt/testrootfs',
'rm -rf /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',
+ '[ -e /mnt/testrootfs/boot/uImage ] || [ -L /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage',
]
for _, dtbfn in self.dtbs.iteritems():