[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     3757d1f33bb04e5eabcfb0de714680b23ba64214
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:00:09 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:00:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3757d1f3

Revert "Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252."

This reverts commit c57b514c2295df27eafe57dfb1452b486e9c547b.

---
 targets/support/functions.sh |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index a0eaae2..cb70bdd 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,8 +1,19 @@
-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}"/
+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
 }
 
 delete_from_chroot(){