Re: [PATCH] qemuboot: don't fail when QB_DEFAULT_KERNEL isn't symlink

[Robert Yang <liezhi.yang@windriver.com>]

On 09/28/2016 03:03 PM, Martin Jansa wrote:
> * 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>
> ---
>  meta/classes/qemuboot.bbclass | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
> index 97a2357..a3a05ba 100644
> --- a/meta/classes/qemuboot.bbclass
> +++ b/meta/classes/qemuboot.bbclass
> @@ -69,7 +69,11 @@ 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)

os.path.realpath(kernel_link) should work for regular file or symlink.

// Robert

> +    try:
> +        kernel = os.readlink(kernel_link)
> +    except OSError as e:
> +        # we assume it failed, because QB_DEFAULT_KERNEL is already real file or hardlink, not symlink
> +        kernel = kernel_link
>      cf.set('config_bsp', 'QB_DEFAULT_KERNEL', kernel)
>
>      bb.utils.mkdirhier(os.path.dirname(qemuboot))
>