From: Ming Liu <[email protected]> Move the implementation to do_install, this fixes a following issue: | Error: Transaction check error: | file ..environment-setup.d conflicts between attempted installs of | nativesdk-cmake-3.7.2-r0.x86_64_nativesdk and | nativesdk-qtbase-tools-5.8.0+git0+49dc9aa409-r0.x86_64_nativesdk
Signed-off-by: Ming Liu <[email protected]> --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 33be99e..98e35cc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -169,9 +169,7 @@ do_install() { # Fix up absolute paths in scripts grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' -} -fakeroot do_generate_qt_environment_file() { mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d/ script=${D}${SDKPATHNATIVE}/environment-setup.d/qt5.sh @@ -200,6 +198,4 @@ fakeroot do_generate_qt_environment_file() { sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script } -addtask generate_qt_environment_file after do_install before do_package - SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce" -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
