From 7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 14 Feb 2014 18:58:40 -0200 Subject: [PATCH] nativesdk-qtbase: Fix install error in case install task is rerun 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. Signed-off-by: Otavio Salvador --- 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 c4ef6e80e5..36bc334a40 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}