From d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Fri, 11 Jul 2014 19:03:24 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 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(): -- cgit v1.2.3-54-g00ecf