[PATCH] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}

[PATCH] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

This way we don't mangle ${B} and can repeat do_install if necessary. And
previously it would require running do_compile again to restore the proper
state of ${B}.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-qt/qt5/nativesdk-qtbase.inc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index a7809d3..14a3cbe 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -189,14 +189,12 @@ do_install() {
     # Fix install paths for all
     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
-    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}
 
+    # replace the native qmake installed above with nativesdk version
+    rm -rf ${D}${bindir}/qmake
+    install -m 755 ${B}/bin/qmake-real ${D}${bindir}/qmake
+
     # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
     # e.g. qt3d, qtwayland
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
-- 
1.8.3.2

Re: [PATCH] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}

[Otavio Salvador]

Hello Denys,

On Mon, Feb 17, 2014 at 6:05 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> This way we don't mangle ${B} and can repeat do_install if necessary. And
> previously it would require running do_compile again to restore the proper
> state of ${B}.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

This seems to not work as expected.

| make[1]: Leaving directory
`.../yocto/build/tmp/work/i686-nativesdk-oelsdk-linux/nativesdk-qtbase/5.2.0-r0/build/src'
| install: cannot stat
`.../yocto/build/tmp/work/i686-nativesdk-oelsdk-linux/nativesdk-qtbase/5.2.0-r0/build/bin/qmake-real':
No such file or directory

This happens when we have a work dir populated. So as do_compile hash
will match we need to bump the PR to ensure a full rebuild.

Another issue:

ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed
but not shipped
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/bin/qmake
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/bin/.debug
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/bin/.debug/qmake

You should install it at OE_QMAKE_PATH_QT_BINS so we can have multiple
Qt toolchains in same SDK.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750