[oe] [meta-qt5] [PATCH] nativesdk-qtbase: drop fakeroot task do_generate_qt_environment_file

[Diaz de Grenu, Jose]

I had prepared a similar patch. That one works for me.

Thanks

From: Ming Liu [mailto:liu.ming50 at gmail.com]
Sent: Saturday, January 13, 2018 2:37 AM
To: openembedded-devel <openembedded-devel at lists.openembedded.org>; Diaz de Grenu, Jose <Jose.DiazdeGrenu at digi.com>
Cc: Ming Liu <liu.ming50 at gmail.com>
Subject: Re: [meta-qt5] [PATCH] nativesdk-qtbase: drop fakeroot task do_generate_qt_environment_file

Hi, Jose:

I encountered a same environment-setup.d conflict issue, it could be fixed by this patch per my test.

//Ming Liu



2018-01-13 2:33 GMT+01:00 <liu.ming50 at gmail.com<mailto:liu.ming50 at gmail.com>>:
From: Ming Liu <liu.ming50 at gmail.com<mailto:liu.ming50 at gmail.com>>

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 <liu.ming50 at gmail.com<mailto:liu.ming50 at gmail.com>>
---
 recipes-qt/qt5/nativesdk-qtbase_git.bb<http://nativesdk-qtbase_git.bb> | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb<http://nativesdk-qtbase_git.bb> b/recipes-qt/qt5/nativesdk-qtbase_git.bb<http://nativesdk-qtbase_git.bb>
index 33be99e..98e35cc 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb<http://nativesdk-qtbase_git.bb>
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb<http://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