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:24 +0100 |
| commit | 849b1e319a84a710259223f57b2e4c74bc64fe75 (patch) | |
| tree | ff02e91a18e76ed9ed9791615f7188a97f58bc64 /meta-yocto-bsp/lib | |
| parent | e06f8c0f07510b3bd31b21419546c7b02eaabd75 (diff) | |
| download | openembedded-core-contrib-849b1e319a84a710259223f57b2e4c74bc64fe75.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.
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')
| -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): '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(): |