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:
parent
db9d6b401c
commit
7c5306107c
|
@ -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"
|
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
|
# switch back the proper qmake
|
||||||
rm ${B}/bin/qmake
|
if [ -e ${B}/bin/qmake-real ]; then
|
||||||
mv ${B}/bin/qmake-real ${B}/bin/qmake
|
rm ${B}/bin/qmake
|
||||||
|
mv ${B}/bin/qmake-real ${B}/bin/qmake
|
||||||
|
fi
|
||||||
|
|
||||||
oe_runmake install INSTALL_ROOT=${D}
|
oe_runmake install INSTALL_ROOT=${D}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue