summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-02-14 18:58:40 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2014-02-14 18:58:40 -0200
commit7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a (patch)
treecc9e2299db8e76303e4c9658eb619f07ecfd4b1b /recipes-qt/qt5
parentdb9d6b401c101685dfb89557e06e451dcc0af1f0 (diff)
downloadmeta-qt5-7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a.tar.gz
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>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase.inc6
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() {
178 find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" 178 find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
179 179
180 # switch back the proper qmake 180 # switch back the proper qmake
181 rm ${B}/bin/qmake 181 if [ -e ${B}/bin/qmake-real ]; then
182 mv ${B}/bin/qmake-real ${B}/bin/qmake 182 rm ${B}/bin/qmake
183 mv ${B}/bin/qmake-real ${B}/bin/qmake
184 fi
183 185
184 oe_runmake install INSTALL_ROOT=${D} 186 oe_runmake install INSTALL_ROOT=${D}
185 187