diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-30 13:45:25 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 12:34:37 +0000 |
| commit | 82f2b5b3afe464fbc49489bc2b03d208c32b2278 (patch) | |
| tree | 4332271b03f985c8f15637926c6f301e02f3a846 /classes | |
| parent | 532a78ccd3a401b8338df3b6eb945874694603b3 (diff) | |
mingw: skip symlinks pointing to directories
gphoto2 has a infinite loop caused by a symlink, which breaks the
mingw toolchain creation. Instead of adding more checks, skip all
directories.
Change-Id: Iec4fb96da12874dcc4939ca8a8af1f956ef3d164
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_b2qt_sdk.bbclass | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass index 75c6e551..2902f968 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass @@ -38,10 +38,7 @@ replace_sysroot_symlink() { #check whether TARGET is inside the sysroot when not prepend the sysroot TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}` rm "${SOURCE}" - if [ -d "${TARGET}" ]; then - cp -r "${TARGET}" "${SOURCE}" - replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE} - elif [ -f "${TARGET}" ]; then + if [ -f "${TARGET}" ]; then cp "${TARGET}" "${SOURCE}" elif [ -e "${TARGET}" ]; then touch "${SOURCE}" |