diff options
Diffstat (limited to 'meta-boot2qt/classes')
-rw-r--r-- | meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | 2 | ||||
-rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 3 |
2 files changed, 3 insertions, 2 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}#" \ |