summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-12-17 16:35:55 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-12-18 14:01:13 +0000
commita143fbcac5a77cf03ca9f11eea9cbb95132b35cd (patch)
treeccb2a6ab15f9fd87a826e03dc3628256cadd9cee
parent9ee5a7fcf774d07862fdc18c5fc11c6d88bad9a8 (diff)
downloadmeta-boot2qt-a143fbcac5a77cf03ca9f11eea9cbb95132b35cd.tar.gz
Use ABI flavor with QtCreator
QtCreator 4.8 allows adding new ABI flavors that can be used to differentiate otherwise identical tools. Using our own abi flavor prevents QtCreator from mixing incompatible tools with one from yocto toolchain. Task-number: QTAUTO-793 Change-Id: Ibba6e42b25e404aff2a20a021fe7833455f0de9b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass2
-rw-r--r--meta-boot2qt/classes/qbsp.bbclass3
-rwxr-xr-xmeta-boot2qt/files/configure-qtcreator.sh6
-rw-r--r--meta-boot2qt/files/qbsp/toolchain_installscript.qs8
4 files changed, 15 insertions, 4 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index f35ebfe..6278d11 100644
--- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -91,7 +91,7 @@ create_qtcreator_configure_script () {
91 # add qtcreator configuration script 91 # add qtcreator configuration script
92 install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} 92 install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
93 sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh 93 sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
94 sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh 94 sed -i -e '/^ABI=/c\ABI="${ABI}-linux-poky-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
95} 95}
96 96
97create_qtcreator_configure_script_sdkmingw32 () { 97create_qtcreator_configure_script_sdkmingw32 () {
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index fbfd266..d61e12b 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -27,7 +27,7 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30inherit meta nopackages abi-arch 30inherit meta nopackages abi-arch siteinfo
31 31
32FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:" 32FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:"
33 33
@@ -87,6 +87,7 @@ patch_installer_files() {
87 -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \ 87 -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
88 -e "s#@TARGET_SYS@#${TARGET_SYS}#" \ 88 -e "s#@TARGET_SYS@#${TARGET_SYS}#" \
89 -e "s#@ABI@#${ABI}#" \ 89 -e "s#@ABI@#${ABI}#" \
90 -e "s#@BITS@#${SITEINFO_BITS}#" \
90 -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \ 91 -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
91 -e "s#@SDKPATH@#${SDKPATH}#" \ 92 -e "s#@SDKPATH@#${SDKPATH}#" \
92 -e "s#@SDKFILE@#${SDK_NAME}#" \ 93 -e "s#@SDKFILE@#${SDK_NAME}#" \
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index a7ea288..6899fc3 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -30,7 +30,7 @@
30 30
31set -e 31set -e
32 32
33ABI="arm-linux-generic-elf-32bit" 33ABI="arm-linux-poky-elf-32bit"
34CONFIG="" 34CONFIG=""
35 35
36printUsage () 36printUsage ()
@@ -107,6 +107,10 @@ if [ -n "${REMOVEONLY}" ]; then
107 exit 0 107 exit 0
108fi 108fi
109 109
110${SDKTOOL} addAbiFlavor \
111 --flavor poky \
112 --oses linux || true
113
110${SDKTOOL} addTC \ 114${SDKTOOL} addTC \
111 --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \ 115 --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
112 --name "GCC (${NAME})" \ 116 --name "GCC (${NAME})" \
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 8de238b..32c14e0 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -40,7 +40,7 @@ Component.prototype.createOperations = function()
40 var sysroot = "@SYSROOT@" 40 var sysroot = "@SYSROOT@"
41 var target_sys = "@TARGET_SYS@" 41 var target_sys = "@TARGET_SYS@"
42 var target = "@TARGET@" 42 var target = "@TARGET@"
43 var abi = "@ABI@" 43 var abi = "@ABI@-linux-poky-elf-@BITS@bit"
44 var installPath = "@INSTALLPATH@/toolchain" 44 var installPath = "@INSTALLPATH@/toolchain"
45 var sdkPath = "@SDKPATH@" 45 var sdkPath = "@SDKPATH@"
46 var sdkFile = "@SDKFILE@" 46 var sdkFile = "@SDKFILE@"
@@ -76,6 +76,11 @@ Component.prototype.createOperations = function()
76 cmakeGenerator = "MinGW Makefiles"; 76 cmakeGenerator = "MinGW Makefiles";
77 } 77 }
78 78
79 component.addOperation("Execute", "{0,2}",
80 ["@SDKToolBinary@", "addAbiFlavor",
81 "--flavor", "poky",
82 "--oses", "linux"]);
83
79 component.addOperation("Execute", 84 component.addOperation("Execute",
80 ["@SDKToolBinary@", "addTC", 85 ["@SDKToolBinary@", "addTC",
81 "--id", toolchainId + ".gcc", 86 "--id", toolchainId + ".gcc",
@@ -112,6 +117,7 @@ Component.prototype.createOperations = function()
112 "--name", platform + " " + target, 117 "--name", platform + " " + target,
113 "--type", "Qdb.EmbeddedLinuxQt", 118 "--type", "Qdb.EmbeddedLinuxQt",
114 "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt, 119 "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
120 "--abis", abi,
115 "UNDOEXECUTE", 121 "UNDOEXECUTE",
116 "@SDKToolBinary@", "rmQt", "--id", qtId]); 122 "@SDKToolBinary@", "rmQt", "--id", qtId]);
117 123