diff options
author | Corneliu Stoicescu <corneliux.stoicescu@intel.com> | 2014-07-11 19:03:24 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-17 14:56:49 +0100 |
commit | d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f (patch) | |
tree | d8d8d52f124afd2195ce98edaf50156b1ad945c1 | |
parent | 929e48e0af0aae503fa883d7765400c3f38cf2d9 (diff) | |
download | poky-d66c567b111335e1ad5c63fa5b3dde7fa2d4f00f.tar.gz |
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>
-rw-r--r-- | meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 2 |
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): | |||
45 | 'mount -L testrootfs /mnt/testrootfs', | 45 | 'mount -L testrootfs /mnt/testrootfs', |
46 | 'rm -rf /mnt/testrootfs/*', | 46 | 'rm -rf /mnt/testrootfs/*', |
47 | 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype, | 47 | 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype, |
48 | '[ -e /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', | 48 | '[ -e /mnt/testrootfs/boot/uImage ] || [ -L /mnt/testrootfs/boot/uImage ] || cp ~/test-kernel /mnt/testrootfs/boot/uImage', |
49 | ] | 49 | ] |
50 | 50 | ||
51 | for _, dtbfn in self.dtbs.iteritems(): | 51 | for _, dtbfn in self.dtbs.iteritems(): |