[oe] [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun

[Denys Dmytriyenko]

On Fri, Feb 14, 2014 at 07:02:33PM -0200, Otavio Salvador wrote:
> In case changes are done in do_install and the sstate checksums
> change, the task would fail as the qmake binary has already been
> replaced. Avoid this error checking for the original filename.

BTW, I was working on a different change in this area, which would do the 
qmake swap in ${D} instead of ${B} - that way it would be safe to repeat 
do_install if it fails and it would fix the above issue. Would you rather want 
that change or keep yours?


> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  recipes-qt/qt5/nativesdk-qtbase.inc |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
> index c4ef6e8..36bc334 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -178,8 +178,10 @@ do_install() {
>      find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>  
>      # switch back the proper qmake
> -    rm ${B}/bin/qmake
> -    mv ${B}/bin/qmake-real ${B}/bin/qmake
> +    if [ -e ${B}/bin/qmake-real ]; then
> +        rm ${B}/bin/qmake
> +        mv ${B}/bin/qmake-real ${B}/bin/qmake
> +    fi
>  
>      oe_runmake install INSTALL_ROOT=${D}
>  
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel