From 15d42fc22cccf14b8b59b9288d5b19e612e92501 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 19 May 2020 09:48:58 +0300 Subject: [PATCH] Remove obsolete install fix for qmake builds With recipe-sysroot now used, the concurrent installation cannot occur and the install fix is not needed. --- classes/qt6-qmake.bbclass | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index 8eae4fb..6c917ff 100644 --- a/classes/qt6-qmake.bbclass +++ b/classes/qt6-qmake.bbclass @@ -242,21 +242,6 @@ do_install_class-native() { fi } -qmake5_base_fix_install() { - STAGING_PATH=$1 - if [ -d ${D}${STAGING_PATH} ] ; then - echo "Some files are installed in wrong directory ${D}${STAGING_PATH}" - cp -ra ${D}${STAGING_PATH}/* ${D} - rm -rf ${D}${STAGING_PATH} - # remove empty dirs - TMP=`dirname ${D}${STAGING_PATH}` - while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; - done - fi -} - do_install() { # Fix install paths for all find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" @@ -265,14 +250,6 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - # concurrent builds may cause qmake to regenerate Makefiles and override the above - # sed changes. If that happens, move files manually to correct location. - qmake5_base_fix_install ${STAGING_DIR_TARGET} - qmake5_base_fix_install ${STAGING_DIR_HOST} - qmake5_base_fix_install ${STAGING_DIR_NATIVE} - # Replace host paths with qmake built-in properties find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \ sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \