diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-14 18:58:40 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-14 18:58:40 -0200 |
| commit | 7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a (patch) | |
| tree | cc9e2299db8e76303e4c9658eb619f07ecfd4b1b | |
| parent | db9d6b401c101685dfb89557e06e451dcc0af1f0 (diff) | |
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 <otavio@ossystems.com.br>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index c4ef6e80..36bc334a 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} |