diff options
| author | Mika Westerberg <mika.westerberg@iki.fi> | 2009-02-26 07:11:03 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2009-03-07 16:05:39 +0200 |
| commit | 98dfaf9468a1cc02fe7f77f2778e3d738f40d022 (patch) | |
| tree | d784c0f1e9790c84a1b066f212783ba417e01c7d | |
| parent | 5400b6bf49e10f0602612a4bf86c75c1bd240794 (diff) | |
Bugfix: Now original target name is used when searching libsb2.
Signed-off-by: Lauri Aarnio <Lauri.Aarnio@iki.fi>
| -rwxr-xr-x | utils/sb2 | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -215,6 +215,11 @@ function clone_target_root_dir_from() # cp -Rp does not preserve hard links, but cpio does (cd $source_directory; find . -depth -print | cpio -pamd $SBOX_SESSION_DIR/target_root) + # + # We store path of the original target root here. It + # is used later on when libsb2 search path is being formed. + # + SBOX_CLONED_TARGET_ROOT=$source_directory SBOX_TARGET_ROOT=$SBOX_SESSION_DIR/target_root SB2_TEMP_DPKG_ADMIN_DIR=$SBOX_SESSION_DIR/tmp-pkg-db mkdir -p $SB2_TEMP_DPKG_ADMIN_DIR @@ -354,6 +359,7 @@ sbox_target_toolchain_dir="$SBOX_TARGET_TOOLCHAIN_DIR" sbox_mapmode="$SBOX_MAPMODE" sbox_mode_specific_options="$SBOX_MODE_SPECIFIC_OPTIONS" sbox_target_root="$SBOX_TARGET_ROOT" +sbox_cloned_target_root="$SBOX_CLONED_TARGET_ROOT" sbox_tools_root="$SBOX_TOOLS_ROOT" sbox_temp_dpkg_admin_dir="$SB2_TEMP_DPKG_ADMIN_DIR" @@ -763,7 +769,11 @@ END if [ "$SBOX_CPUTRANSPARENCY_METHOD" == "" ]; then # CPU transparency method has not been set: # host CPU == target CPU - target_basename=`basename $SBOX_TARGET_ROOT` + if [ -n "$SBOX_CLONED_TARGET_ROOT" ]; then + target_basename=`basename $SBOX_CLONED_TARGET_ROOT` + else + target_basename=`basename $SBOX_TARGET_ROOT` + fi write_ld_library_path_replacement_to_exec_config \ $SBOX_TARGET_ROOT conf_target_ld_so_library_path \ @@ -1243,6 +1253,7 @@ fi # but have been moved to sb2-session.conf. unset SBOX_MAPMODE unset SBOX_TARGET_ROOT +unset SBOX_CLONED_TARGET_ROOT unset SBOX_TOOLS_ROOT # ------------ |