sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Otavio Salvador 2014-02-14 18:58:40 -02:00
parent db9d6b401c
commit 7c5306107c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/nativesdk-qtbase.inc
View File

@ -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}