From 239a43fc4037bfe941bb60dd077ee477de177b7c Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 15 Mar 2013 18:01:53 +0200 Subject: populate_sdk_base: search for perl scripts after symlinks are relocated grep will throw "No such file or directory" errors for all invalid symlinks. To overcome this, move the search after the symlinks have been changed to point to the new location. Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/classes/populate_sdk_base.bbclass') diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 7af2d2e9e2..4015030914 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -269,6 +269,11 @@ fi # replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc $SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\|source\).*text"|cut -d':' -f1|$SUDO_EXEC xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" +# change all symlinks pointing to ${SDKPATH} +for l in $($SUDO_EXEC find $native_sysroot -type l); do + $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l +done + # find out all perl scripts in $native_sysroot and modify them replacing the # host perl with SDK perl. for perl_script in $($SUDO_EXEC grep "^#!.*perl" -rl $native_sysroot); do @@ -276,11 +281,6 @@ for perl_script in $($SUDO_EXEC grep "^#!.*perl" -rl $native_sysroot); do "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script done -# change all symlinks pointing to ${SDKPATH} -for l in $($SUDO_EXEC find $native_sysroot -type l); do - $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l -done - echo done # delete the relocating script, so that user is forced to re-run the installer -- cgit 1.2.3-korg