Skip to content
Snippets Groups Projects
Commit 06842e46 authored by David Schulz's avatar David Schulz
Browse files

Replace symlinks in copied folders.


Change-Id: Idb8548b8f375e56b03b87de000269dd9fd43cb55
Reviewed-by: default avatarSamuli Piippo <samuli.piippo@theqtcompany.com>
parent 769ae557
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,8 @@ inherit populate_sdk ...@@ -23,7 +23,8 @@ inherit populate_sdk
replace_sysroot_symlink() { replace_sysroot_symlink() {
SYMLINK_SYSROOT=$1 SYMLINK_SYSROOT=$1
for SOURCE in `find ${SYMLINK_SYSROOT} -type l` SEARCH_FOLDER=$2
for SOURCE in `find ${SEARCH_FOLDER} -type l`
do do
TARGET=`readlink -m "${SOURCE}"` TARGET=`readlink -m "${SOURCE}"`
#check whether TARGET is inside the sysroot when not prepend the sysroot #check whether TARGET is inside the sysroot when not prepend the sysroot
...@@ -31,6 +32,7 @@ replace_sysroot_symlink() { ...@@ -31,6 +32,7 @@ replace_sysroot_symlink() {
rm "${SOURCE}" rm "${SOURCE}"
if [ -d "${TARGET}" ]; then if [ -d "${TARGET}" ]; then
cp -r "${TARGET}" "${SOURCE}" cp -r "${TARGET}" "${SOURCE}"
replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE}
elif [ -f "${TARGET}" ]; then elif [ -f "${TARGET}" ]; then
cp "${TARGET}" "${SOURCE}" cp "${TARGET}" "${SOURCE}"
elif [ -e "${TARGET}" ]; then elif [ -e "${TARGET}" ]; then
...@@ -40,8 +42,8 @@ replace_sysroot_symlink() { ...@@ -40,8 +42,8 @@ replace_sysroot_symlink() {
} }
fakeroot tar_sdk_sdkmingw32() { fakeroot tar_sdk_sdkmingw32() {
replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT}
replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} ${SDK_OUTPUT}${SDKPATHNATIVE}
# Package it up # Package it up
mkdir -p ${SDK_DEPLOY} mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}/${SDKPATH} cd ${SDK_OUTPUT}/${SDKPATH}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment