From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 13 May 2014 10:20:04 +0000 (+0100)
Subject: [build] Avoid errors when build directory is mounted via NFS
X-Git-Tag: v1.20.1~1182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=779d65222e0f019d0607738fb5a24693adf94629;p=thirdparty%2Fipxe.git

[build] Avoid errors when build directory is mounted via NFS

Reported-by: Robin Smidsrød <robin@smidsrod.no>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/arch/x86/Makefile.linux b/src/arch/x86/Makefile.linux
index e35b04f0e..1faf84753 100644
--- a/src/arch/x86/Makefile.linux
+++ b/src/arch/x86/Makefile.linux
@@ -10,4 +10,4 @@ SRCDIRS += arch/x86/core/linux
 
 $(BIN)/%.linux : $(BIN)/%.linux.tmp
 	$(QM)$(ECHO) "  [FINISH] $@"
-	$(Q)cp -p $< $@
+	$(Q)$(CP) $< $@
diff --git a/src/util/geniso b/src/util/geniso
index 4dc721927..bcf294a66 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -37,13 +37,13 @@ out=$1
 shift
 dir=`mktemp -d bin/iso.dir.XXXXXX`
 cfg=$dir/isolinux.cfg
-cp -p $isolinux_bin $dir
+cp $isolinux_bin $dir
 
 # syslinux 6.x needs a file called ldlinux.c32
 ldlinux_c32=$(dirname ${isolinux_bin})/ldlinux.c32
 if [ -s ${ldlinux_c32} ]
 then
-	cp -p ${ldlinux_c32} ${dir}
+	cp ${ldlinux_c32} ${dir}
 fi
 
 cat > $cfg <<EOF
@@ -70,7 +70,7 @@ do
 	first=$g
 	echo LABEL $b
 	echo "" KERNEL $g
-	cp -p $f $dir/$g
+	cp $f $dir/$g
 done >> $cfg
 $mkisofs -quiet -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
 rm -fr $dir