From: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
Date: Fri, 2 Nov 2012 00:56:56 +0000 (-0400)
Subject: RE-Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug... 
X-Git-Tag: catalyst-2.0.12.2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ca68bf59dfa62b160ba29a6ac3ea5270744d48a;p=catalyst.git

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

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(){