diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-19 16:09:33 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-20 08:50:03 +0300 |
| commit | f650da0607dccd6ec829f3a23d554252c233aac8 (patch) | |
| tree | ad37cbf871f95b927f3c167c0a9f6c7a62065348 /meta-boot2qt | |
| parent | c88cc0b39f65644bb0349bca836adf9b7193a2f5 (diff) | |
sdk: fix symlink replacement for 7z sdk package
Avoid using IFS as it doesn't work the same way in all shells.
Task-number: QTBUG-87305
Change-Id: I360ace1054cebc595ee6d406040b2bbfcdc0198a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Diffstat (limited to 'meta-boot2qt')
| -rw-r--r-- | meta-boot2qt/classes/populate_b2qt_sdk.bbclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass index 92c23ae4..30f75b41 100644 --- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass @@ -35,14 +35,12 @@ EXTRA_TAR_OPTIONS="$EXTRA_TAR_OPTIONS --checkpoint=9999999" SDK_PRE_INSTALL_COMMAND = "${quiet_sdk_extraction}" replace_sysroot_symlink() { - IFS=$'\n' - SYMLINK_SYSROOT=$1 - SEARCH_FOLDER=$2 - for SOURCE in `find ${SEARCH_FOLDER} -type l` + SYSROOT=$1 + find ${SYSROOT} -type l | while read SOURCE do TARGET=`readlink -m "${SOURCE}"` #check whether TARGET is inside the sysroot when not prepend the sysroot - TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}` + TARGET=`echo ${TARGET} | grep "^${SYSROOT}" || echo ${SYSROOT}${TARGET}` rm "${SOURCE}" if [ -f "${TARGET}" ]; then cp "${TARGET}" "${SOURCE}" @@ -50,14 +48,13 @@ replace_sysroot_symlink() { touch "${SOURCE}" fi done - unset IFS } do_populate_sdk[depends] += "p7zip-native:do_populate_sysroot" fakeroot archive_sdk_sdkmingw32() { - replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT} - replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} ${SDK_OUTPUT}${SDKPATHNATIVE} + replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} + replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} # Package it up cd ${SDK_OUTPUT}/${SDKPATH} 7za a ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.7z * |