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) | |
download | meta-boot2qt-82f2b5b3afe464fbc49489bc2b03d208c32b2278.tar.gz |
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 75c6e55..2902f96 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass | |||
@@ -38,10 +38,7 @@ replace_sysroot_symlink() { | |||
38 | #check whether TARGET is inside the sysroot when not prepend the sysroot | 38 | #check whether TARGET is inside the sysroot when not prepend the sysroot |
39 | TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}` | 39 | TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}` |
40 | rm "${SOURCE}" | 40 | rm "${SOURCE}" |
41 | if [ -d "${TARGET}" ]; then | 41 | if [ -f "${TARGET}" ]; then |
42 | cp -r "${TARGET}" "${SOURCE}" | ||
43 | replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE} | ||
44 | elif [ -f "${TARGET}" ]; then | ||
45 | cp "${TARGET}" "${SOURCE}" | 42 | cp "${TARGET}" "${SOURCE}" |
46 | elif [ -e "${TARGET}" ]; then | 43 | elif [ -e "${TARGET}" ]; then |
47 | touch "${SOURCE}" | 44 | touch "${SOURCE}" |