Create separate automotive SDK

Automotive toolchain will contain packages that are not available
in the B2Qt embedded toolchain. Add empty packagegroup recipe that
can be used to add new content to automotive sdk.

Change-Id: I43c520db9b4f292226b2b5402bb460232a20ede3
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

7 files changed, 132 insertions, 48 deletions

diff --git a/recipes-qt/meta/b2qt-sdk.inc b/recipes-qt/meta/b2qt-sdk.inc
new file mode 100644
index 0000000..9eddadc
--- /dev/null
+++ b/recipes-qt/meta/b2qt-sdk.inc
@@ -0,0 +1,69 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+
+inherit populate_sdk populate_sdk_qt5_base
+
+SRC_URI = " \
+    file://qmake.conf \
+    file://qplatformdefs.h \
+    "
+S = "${WORKDIR}"
+
+SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
+SDK_MKSPEC = "devices/linux-oe-generic-g++"
+SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri"
+SDK_DYNAMIC_FLAGS = "-O. -pipe -g"
+
+create_sdk_files_append () {
+    # Install the toolchain user's generic device mkspec
+    install -d ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
+    install -m 0644 ${WORKDIR}/qmake.conf ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
+    install -m 0644 ${WORKDIR}/qplatformdefs.h ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
+
+    # Fill in the qdevice.pri file which will be used by the device mksspec
+    static_cflags="${TARGET_CFLAGS}"
+    static_cxxflags="${TARGET_CXXFLAGS}"
+    for i in ${SDK_DYNAMIC_FLAGS}; do
+        static_cflags=$(echo $static_cflags | sed -e "s/$i //")
+        static_cxxflags=$(echo $static_cxxflags | sed -e "s/$i //")
+    done
+    echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI}
+    echo "CROSS_COMPILE = ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
+
+    # Setup qt.conf to point at the device mkspec by default
+    qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
+    echo 'HostSpec = linux-g++' >> $qtconf
+    echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
+
+    # change staging paths to target sdk paths, so they can be relocated at install time
+    sed -i -e 's:${STAGING_DIR_NATIVE}:${SDKPATHNATIVE}:g' ${SDK_MKSPEC_DIR}/*.pri
+    sed -i -e 's:${STAGING_DIR}/[^/]*:${SDKTARGETSYSROOT}:g' ${SDK_MKSPEC_DIR}/*.pri
+}
+
+SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
+    $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/*.pri ;"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf b/recipes-qt/meta/files/qmake.conf
index b5962dc..b5962dc 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf
+++ b/recipes-qt/meta/files/qmake.conf
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h b/recipes-qt/meta/files/qplatformdefs.h
index e10ebcf..e10ebcf 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h
+++ b/recipes-qt/meta/files/qplatformdefs.h
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
new file mode 100644
index 0000000..6b95276
--- /dev/null
+++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
+
+require b2qt-sdk.inc
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
+                          packagegroup-b2qt-automotive-qt5-toolchain-target"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 15c8b97..43f29b3 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -21,54 +21,8 @@
 #############################################################################
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
-PR = "r0"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
 
-inherit populate_sdk populate_sdk_qt5_base
+require b2qt-sdk.inc
 
 TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target"
-
-SRC_URI = " \
-    file://qmake.conf \
-    file://qplatformdefs.h \
-    "
-S = "${WORKDIR}"
-
-SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
-SDK_MKSPEC = "devices/linux-oe-generic-g++"
-SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri"
-SDK_DYNAMIC_FLAGS = "-O. -pipe -g"
-
-create_sdk_files_append () {
-    # Install the toolchain user's generic device mkspec
-    install -d ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
-    install -m 0644 ${WORKDIR}/qmake.conf ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
-    install -m 0644 ${WORKDIR}/qplatformdefs.h ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
-
-    # Fill in the qdevice.pri file which will be used by the device mksspec
-    static_cflags="${TARGET_CFLAGS}"
-    static_cxxflags="${TARGET_CXXFLAGS}"
-    for i in ${SDK_DYNAMIC_FLAGS}; do
-        static_cflags=$(echo $static_cflags | sed -e "s/$i //")
-        static_cxxflags=$(echo $static_cxxflags | sed -e "s/$i //")
-    done
-    echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI}
-    echo "CROSS_COMPILE = ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cflags}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
-
-    # Setup qt.conf to point at the device mkspec by default
-    qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
-    echo 'HostSpec = linux-g++' >> $qtconf
-    echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
-
-    # change staging paths to target sdk paths, so they can be relocated at install time
-    sed -i -e 's:${STAGING_DIR_NATIVE}:${SDKPATHNATIVE}:g' ${SDK_MKSPEC_DIR}/*.pri
-    sed -i -e 's:${STAGING_DIR}/[^/]*:${SDKTARGETSYSROOT}:g' ${SDK_MKSPEC_DIR}/*.pri
-}
-
-SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
-    $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/*.pri ;"
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
new file mode 100644
index 0000000..cfb7245
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK"
+LICENSE = "QtEnterprise"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    "
diff --git a/scripts/upload.sh b/scripts/upload.sh
index f74da52..aba0e76 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -28,7 +28,7 @@ RELEASE=5.6
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ ${AUTOMOTIVE} = "true" ]; then
-  scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-automotive-toolchain-${MACHINE}.sh
+  scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-automotive-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-automotive-toolchain-${MACHINE}.sh
   if [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ]; then
     scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
   elif [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ]; then