diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2016-09-28 09:28:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 15:02:54 +0100 |
| commit | a11d0d8641b7dfb05c78645cf21f2c04a08c4822 (patch) | |
| tree | 6dc90ae0d2667726ab409d5ff038a225234b2d9b /meta/classes/qemuboot.bbclass | |
| parent | 145a29ca99d9fec5eff97d77c8cff6356fe88ba5 (diff) | |
| download | openembedded-core-a11d0d8641b7dfb05c78645cf21f2c04a08c4822.tar.gz openembedded-core-a11d0d8641b7dfb05c78645cf21f2c04a08c4822.tar.bz2 openembedded-core-a11d0d8641b7dfb05c78645cf21f2c04a08c4822.zip | |
qemuboot: don't fail when QB_DEFAULT_KERNEL isn't symlink
* in some cases we might set QB_DEFAULT_KERNEL to the real filename
instead of symlink and then this whole readlink work around actually
breaks the build, because os.readlink fails on normal files:
>>> os.readlink('deploy/images/qemux86/bzImage-linux-yocto-qemux86-master-20160927084848.bin')
'bzImage-linux-yocto-qemux86.bin'
>>> os.readlink('deploy/images/qemux86/bzImage-linux-yocto-qemux86.bin')
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
OSError: [Errno 22] Invalid argument: '/jenkins/mjansa/build-starfish-master-mcf/BUILD/deploy/images/qemux86/bzImage-linux-yocto-qemux86.bin'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qemuboot.bbclass')
| -rw-r--r-- | meta/classes/qemuboot.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 97a235772d..ef9a128796 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -69,7 +69,7 @@ python write_qemuboot_conf() { # to the kernel file, which hinders relocatability of the qb conf. # Read the link and replace it with the full filename of the target. kernel_link = os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('QB_DEFAULT_KERNEL', True)) - kernel = os.readlink(kernel_link) + kernel = os.path.realpath(kernel_link) cf.set('config_bsp', 'QB_DEFAULT_KERNEL', kernel) bb.utils.mkdirhier(os.path.dirname(qemuboot)) |