diff options
Diffstat (limited to 'meta-boot2qt')
8 files changed, 23 insertions, 11 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 | ||
97 | create_qtcreator_configure_script_sdkmingw32 () { | 97 | create_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 | ||
30 | inherit meta nopackages abi-arch | 30 | inherit meta nopackages abi-arch siteinfo |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:" | 32 | FILESEXTRAPATHS_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 | ||
31 | set -e | 31 | set -e |
32 | 32 | ||
33 | ABI="arm-linux-generic-elf-32bit" | 33 | ABI="arm-linux-poky-elf-32bit" |
34 | CONFIG="" | 34 | CONFIG="" |
35 | 35 | ||
36 | printUsage () | 36 | printUsage () |
@@ -107,6 +107,10 @@ if [ -n "${REMOVEONLY}" ]; then | |||
107 | exit 0 | 107 | exit 0 |
108 | fi | 108 | fi |
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 4d25bf7..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@" |
@@ -73,8 +73,14 @@ Component.prototype.createOperations = function() | |||
73 | executableExt = ".exe"; | 73 | executableExt = ".exe"; |
74 | hostSysroot = "i686-pokysdk-mingw32"; | 74 | hostSysroot = "i686-pokysdk-mingw32"; |
75 | toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name; | 75 | toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name; |
76 | cmakeGenerator = "MinGW Makefiles"; | ||
76 | } | 77 | } |
77 | 78 | ||
79 | component.addOperation("Execute", "{0,2}", | ||
80 | ["@SDKToolBinary@", "addAbiFlavor", | ||
81 | "--flavor", "poky", | ||
82 | "--oses", "linux"]); | ||
83 | |||
78 | component.addOperation("Execute", | 84 | component.addOperation("Execute", |
79 | ["@SDKToolBinary@", "addTC", | 85 | ["@SDKToolBinary@", "addTC", |
80 | "--id", toolchainId + ".gcc", | 86 | "--id", toolchainId + ".gcc", |
@@ -111,6 +117,7 @@ Component.prototype.createOperations = function() | |||
111 | "--name", platform + " " + target, | 117 | "--name", platform + " " + target, |
112 | "--type", "Qdb.EmbeddedLinuxQt", | 118 | "--type", "Qdb.EmbeddedLinuxQt", |
113 | "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt, | 119 | "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt, |
120 | "--abis", abi, | ||
114 | "UNDOEXECUTE", | 121 | "UNDOEXECUTE", |
115 | "@SDKToolBinary@", "rmQt", "--id", qtId]); | 122 | "@SDKToolBinary@", "rmQt", "--id", qtId]); |
116 | 123 | ||
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index da0f658..ee26f08 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | |||
@@ -31,7 +31,7 @@ | |||
31 | DESCRIPTION = "Neptune 3 IVI UI" | 31 | DESCRIPTION = "Neptune 3 IVI UI" |
32 | LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )" | 32 | LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )" |
33 | LIC_FILES_CHKSUM = "\ | 33 | LIC_FILES_CHKSUM = "\ |
34 | file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \ | 34 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
35 | file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 35 | file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
36 | " | 36 | " |
37 | 37 | ||
@@ -45,7 +45,7 @@ SRC_URI += " \ | |||
45 | file://neptune.service \ | 45 | file://neptune.service \ |
46 | " | 46 | " |
47 | 47 | ||
48 | SRCREV = "c80d9aba17b1b50618ae6311d48f35ec726a4007" | 48 | SRCREV = "be372dec5a64cdfc2b2ba66ea240d9fa1cdbe3eb" |
49 | 49 | ||
50 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" | 50 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" |
51 | 51 | ||
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index 52cfcff..a0b49f6 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | |||
@@ -30,14 +30,14 @@ | |||
30 | DESCRIPTION = "QML Live target runtime" | 30 | DESCRIPTION = "QML Live target runtime" |
31 | 31 | ||
32 | LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" | 32 | LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" |
33 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" | 33 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" |
34 | 34 | ||
35 | inherit qmake5 | 35 | inherit qmake5 |
36 | require recipes-qt/qt5/qt5-git.inc | 36 | require recipes-qt/qt5/qt5-git.inc |
37 | 37 | ||
38 | QT_GIT_PROJECT = "qt-apps" | 38 | QT_GIT_PROJECT = "qt-apps" |
39 | 39 | ||
40 | SRCREV = "329a996f6a52494ef677107593a0146c71a2880a" | 40 | SRCREV = "dc83ea3bcbcfece8a0c5caeafcdd9f0854ffae6f" |
41 | 41 | ||
42 | DEPENDS = "qtbase qtdeclarative" | 42 | DEPENDS = "qtbase qtdeclarative" |
43 | 43 | ||
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index c267e3f..7c81fc5 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | |||
@@ -29,13 +29,13 @@ | |||
29 | 29 | ||
30 | DESCRIPTION = "Qt component for application lifecycle management" | 30 | DESCRIPTION = "Qt component for application lifecycle management" |
31 | LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial" | 31 | LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial" |
32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" | 32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" |
33 | 33 | ||
34 | inherit qt5-module | 34 | inherit qt5-module |
35 | require recipes-qt/qt5/qt5-git.inc | 35 | require recipes-qt/qt5/qt5-git.inc |
36 | 36 | ||
37 | QT_MODULE_BRANCH = "dev" | 37 | QT_MODULE_BRANCH = "dev" |
38 | SRCREV = "adb57812ee1cf89f3311f8a27ef97abf5d424bde" | 38 | SRCREV = "9c4ff31161c2ea09c790ab143a23b3fe997ed4a3" |
39 | 39 | ||
40 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ | 40 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ |
41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" |
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 4b122c2..cb3f6a3 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | |||
@@ -51,7 +51,7 @@ SRC_URI += " \ | |||
51 | file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ | 51 | file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ |
52 | " | 52 | " |
53 | 53 | ||
54 | SRCREV_qtivi = "15a6672b304fe91a928911e810f5e83f233c790e" | 54 | SRCREV_qtivi = "b18956edd578f49f369f7b3863881d0fadb035df" |
55 | SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" | 55 | SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" |
56 | SRCREV = "${SRCREV_qtivi}" | 56 | SRCREV = "${SRCREV_qtivi}" |
57 | SRCREV_FORMAT = "qtivi_qface" | 57 | SRCREV_FORMAT = "qtivi_qface" |