summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-01 18:01:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-03 17:41:16 +0100
commitaa76de9473f9e63e7bdc5b4c8beaa37e9604acc0 (patch)
treeb636bdc488f1df583bc25fb1c2ace9fa70ee4068
parent6ebd0a8c9a7e514e3ee46ae2c61b3a9ec962101f (diff)
downloadpoky-aa76de9473f9e63e7bdc5b4c8beaa37e9604acc0.tar.gz
adt_installer: Fix real envrionment script issues
The previous change to adt_installer was incorrect, this reverts it and fixes the real issue. The real issue is that if a previous installation was present, it may have been moved and therefore the paths returned by opkg could be a little odd. To address this, when we move files to a different location, ensure we update the *.list files with the revised paths. This means later installs over the top return consistent values from opkg and the script works as intended. (From OE-Core rev: 8a206f88e5396d7d136480e0efdb5071d5aafeb6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 8d2ff57821..f9c6d18a48 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -157,7 +157,7 @@ for target_type in $YOCTOADT_TARGETS; do
157 157
158 # get the environment setup script paths: original (the one before relocation) 158 # get the environment setup script paths: original (the one before relocation)
159 # and relocated 159 # and relocated
160 env_script_original=$NATIVE_INSTALL_DIR`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\ 160 env_script_original=`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
161 grep environment-setup` 161 grep environment-setup`
162 env_script_relocated=$INSTALL_FOLDER/${env_script_original##*/} 162 env_script_relocated=$INSTALL_FOLDER/${env_script_original##*/}
163 163
@@ -213,6 +213,8 @@ if [ -d $NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER ]; then
213 # go to the next directory 213 # go to the next directory
214 dir=$(dirname $dir) 214 dir=$(dirname $dir)
215 done 215 done
216 # Step 3: Rewrite the *.list files to contain the correct paths
217 $SUDO find $NATIVE_INSTALL_DIR/var/lib/opkg -type f -exec sed -i -e '#^$DEFAULT_INSTALL_FOLDER#$NATIVE_INSTALL_DIR#' {} \;
216fi 218fi
217 219
218# Link the ld.so.cache file into the hosts filesystem 220# Link the ld.so.cache file into the hosts filesystem