Fix up toolchain packaging for Windows hosts

Change-Id: Idb7af9308e702b4ef5f26e6423cfa270f8c036e5
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

3 files changed, 48 insertions, 3 deletions

diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
new file mode 100644
index 0000000..54322b4
--- /dev/null
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+inherit populate_sdk
+
+DEPENDS_sdkmingw32 += "gzip-native"
+
+POPULATE_SDK_POST_HOST_COMMAND_append_sdkmingw32 = " replace_host_symlink;"
+
+replace_host_symlink() {
+        for SOURCE in `find ${SDK_OUTPUT}/${SDKPATHNATIVE} -type l`
+        do
+                TARGET=`readlink -f "${SOURCE}"`
+                if [ -e ${TARGET} ]; then
+                        rm "${SOURCE}"
+                        cp -f "${TARGET}" "${SOURCE}"
+                fi
+        done
+}
+
+fakeroot tar_sdk_sdkmingw32() {
+        # Package it up
+        mkdir -p ${SDK_DEPLOY}
+        cd ${SDK_OUTPUT}/${SDKPATH}
+        zip -r ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.zip sysroots
+}
+
diff --git a/recipes-qt/meta/b2qt-sdk.inc b/recipes-qt/meta/b2qt-sdk.inc
index 9eddadc..87ceb96 100644
--- a/recipes-qt/meta/b2qt-sdk.inc
+++ b/recipes-qt/meta/b2qt-sdk.inc
@@ -23,7 +23,7 @@
 LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
 
-inherit populate_sdk populate_sdk_qt5_base
+inherit populate_b2qt_sdk populate_sdk_qt5_base
 
 SRC_URI = " \
     file://qmake.conf \
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
index 3f13aef..fab2c25 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -24,9 +24,8 @@ DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
 PR = "r0"
 LICENSE = "CLOSED"
 
-inherit populate_sdk
+inherit populate_b2qt_sdk
 
 TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target"
 
-