| 1 |
commit: c57b514c2295df27eafe57dfb1452b486e9c547b |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 30 22:22:22 2012 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 30 22:28:26 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c57b514c |
| 7 |
|
| 8 |
Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252. |
| 9 |
|
| 10 |
--- |
| 11 |
targets/support/functions.sh | 21 +++++---------------- |
| 12 |
1 files changed, 5 insertions(+), 16 deletions(-) |
| 13 |
|
| 14 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 15 |
index 0bc5d69..4ccad4c 100644 |
| 16 |
--- a/targets/support/functions.sh |
| 17 |
+++ b/targets/support/functions.sh |
| 18 |
@@ -1,19 +1,8 @@ |
| 19 |
-copy_to_chroot(){ |
| 20 |
- local file_name=$(basename ${1}) |
| 21 |
- local dest_dir=${clst_chroot_path}${2} |
| 22 |
- if [ "${2}" != "" ] |
| 23 |
- then |
| 24 |
- echo "copying ${file_name} to ${dest_dir}" |
| 25 |
- mkdir -p ${dest_dir} |
| 26 |
- cp -pPR ${1} ${dest_dir} |
| 27 |
- [ "${file_name}" != "make.profile" ] && \ |
| 28 |
- chmod 755 ${dest_dir}/${file_name} |
| 29 |
- else |
| 30 |
- echo "copying ${file_name} to ${clst_chroot_path}/tmp" |
| 31 |
- mkdir -p ${chroot_path}/tmp |
| 32 |
- cp -pPR ${1} ${clst_chroot_path}/tmp |
| 33 |
- chmod 755 ${clst_chroot_path}/tmp/${file_name} |
| 34 |
- fi |
| 35 |
+copy_to_chroot() { |
| 36 |
+ local src_file=$1 |
| 37 |
+ local dest_dir=${clst_chroot_path}${2:-/tmp} |
| 38 |
+ echo "copying ${src_file##*/} to ${dest_dir}" |
| 39 |
+ cp -pPR "${src_file}" "${dest_dir}"/ |
| 40 |
} |
| 41 |
|
| 42 |
delete_from_chroot(){ |
Archives