Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252.
authorMike Frysinger <vapier@gentoo.org>
Sun, 30 Sep 2012 22:22:22 +0000 (22:22 +0000)
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Sun, 30 Sep 2012 22:28:26 +0000 (22:28 +0000)
targets/support/functions.sh

index 0bc5d69c5a330091ae30008c8303cc6fd7cf1845..4ccad4ce70061a0c9e8b338c590483b15fef627c 100644 (file)
@@ -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(){