Browse Source

[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>
tags/v1.20.1
Michael Brown 10 years ago
parent
commit
779d65222e
2 changed files with 4 additions and 4 deletions
  1. 1
    1
      src/arch/x86/Makefile.linux
  2. 3
    3
      src/util/geniso

+ 1
- 1
src/arch/x86/Makefile.linux View File

10
 
10
 
11
 $(BIN)/%.linux : $(BIN)/%.linux.tmp
11
 $(BIN)/%.linux : $(BIN)/%.linux.tmp
12
 	$(QM)$(ECHO) "  [FINISH] $@"
12
 	$(QM)$(ECHO) "  [FINISH] $@"
13
-	$(Q)cp -p $< $@
13
+	$(Q)$(CP) $< $@

+ 3
- 3
src/util/geniso View File

37
 shift
37
 shift
38
 dir=`mktemp -d bin/iso.dir.XXXXXX`
38
 dir=`mktemp -d bin/iso.dir.XXXXXX`
39
 cfg=$dir/isolinux.cfg
39
 cfg=$dir/isolinux.cfg
40
-cp -p $isolinux_bin $dir
40
+cp $isolinux_bin $dir
41
 
41
 
42
 # syslinux 6.x needs a file called ldlinux.c32
42
 # syslinux 6.x needs a file called ldlinux.c32
43
 ldlinux_c32=$(dirname ${isolinux_bin})/ldlinux.c32
43
 ldlinux_c32=$(dirname ${isolinux_bin})/ldlinux.c32
44
 if [ -s ${ldlinux_c32} ]
44
 if [ -s ${ldlinux_c32} ]
45
 then
45
 then
46
-	cp -p ${ldlinux_c32} ${dir}
46
+	cp ${ldlinux_c32} ${dir}
47
 fi
47
 fi
48
 
48
 
49
 cat > $cfg <<EOF
49
 cat > $cfg <<EOF
70
 	first=$g
70
 	first=$g
71
 	echo LABEL $b
71
 	echo LABEL $b
72
 	echo "" KERNEL $g
72
 	echo "" KERNEL $g
73
-	cp -p $f $dir/$g
73
+	cp $f $dir/$g
74
 done >> $cfg
74
 done >> $cfg
75
 $mkisofs -quiet -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
75
 $mkisofs -quiet -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
76
 rm -fr $dir
76
 rm -fr $dir

Loading…
Cancel
Save