| 1 |
Another bug in master that should be fixed. This one should apply |
| 2 |
cleanly to master. |
| 3 |
|
| 4 |
================================================================= |
| 5 |
|
| 6 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 7 |
index 6bfa3a2..79fe08a 100755 |
| 8 |
@@ -1,5 +1,6 @@ |
| 9 |
copy_to_chroot() { |
| 10 |
local src_file=$1 |
| 11 |
+ # needed the above tmp_2 in order to trim the leading / next if it has |
| 12 |
one |
| 13 |
local dest_dir=${clst_chroot_path}${2:-/tmp} |
| 14 |
mkdir -p ${dest_dir} |
| 15 |
echo "--- Copying ${src_file##*/} to ${dest_dir}" |
| 16 |
@@ -20,7 +21,7 @@ exec_in_chroot(){ |
| 17 |
# and executes it. |
| 18 |
local file_name=$(basename ${1}) |
| 19 |
local subdir=${2} |
| 20 |
- local destdir=".${subdir}/tmp" |
| 21 |
+ local destdir="${subdir}/tmp" |
| 22 |
|
| 23 |
echo "--- Copying ${file_name} to ${destdir}" |
| 24 |
copy_to_chroot ${1} ${destdir} |
| 25 |
@@ -33,7 +34,7 @@ exec_in_chroot(){ |
| 26 |
chmod +x ${chroot_path}/${destdir}/${file_name} |
| 27 |
|
| 28 |
echo "--- Running ${file_name} in chroot ${chroot_path}" |
| 29 |
- ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1 |
| 30 |
+ ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1 |
| 31 |
|
| 32 |
delete_from_chroot ${destdir}/${file_name} |
| 33 |
delete_from_chroot ${destdir}/chroot-functions.sh |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
-- |
| 38 |
Brian Dolbec <dolsen@g.o> |
Archives