adt_installer: Fix real envrionment script issues

Submitted by Richard Purdie on July 1, 2014, 5:01 p.m. | Patch ID: 74541


Message ID 1404234067.6362.69.camel@ted
State Accepted
Commit 8a206f88e5396d7d136480e0efdb5071d5aafeb6
Headers show

Commit Message

Richard Purdie July 1, 2014, 5:01 p.m.
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.

Signed-off-by: Richard Purdie <>

Patch hide | download patch | download mbox

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 8d2ff57..f9c6d18 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
   # get the environment setup script paths: original (the one before relocation)
   # and relocated
-  env_script_original=$NATIVE_INSTALL_DIR`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
+  env_script_original=`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
 							grep environment-setup`
@@ -213,6 +213,8 @@  if [ -d $NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER ]; then
         # go to the next directory
         dir=$(dirname $dir)
+    # Step 3: Rewrite the *.list files to contain the correct paths
+    $SUDO find $NATIVE_INSTALL_DIR/var/lib/opkg -type f -exec sed -i -e '#^$DEFAULT_INSTALL_FOLDER#$NATIVE_INSTALL_DIR#' {} \;
 # Link the file into the hosts filesystem