From 9ca68bf59dfa62b160ba29a6ac3ea5270744d48a Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 1 Nov 2012 20:56:56 -0400 Subject: [PATCH] RE-Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252. --- targets/support/functions.sh | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index cb70bdd8..a0eaae28 100644 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -1,19 +1,8 @@ -copy_to_chroot(){ - local file_name=$(basename ${1}) - local dest_dir=${clst_chroot_path}${2} - if [ "${2}" != "" ] - then - echo "copying ${file_name} to ${dest_dir}" - mkdir -p ${dest_dir} - cp -pPR ${1} ${dest_dir} - [ "${file_name}" != "make.profile" ] && \ - chmod 755 ${dest_dir}/${file_name} - else - echo "copying ${file_name} to ${clst_chroot_path}/tmp" - mkdir -p ${chroot_path}/tmp - cp -pPR ${1} ${clst_chroot_path}/tmp - chmod 755 ${clst_chroot_path}/tmp/${file_name} - fi +copy_to_chroot() { + local src_file=$1 + local dest_dir=${clst_chroot_path}${2:-/tmp} + echo "copying ${src_file##*/} to ${dest_dir}" + cp -pPR "${src_file}" "${dest_dir}"/ } delete_from_chroot(){ -- 2.26.2