mirror of https://github.com/ipxe/ipxe.git
[build] Allow safe concurrent builds of .iso, .liso and .sdsk targets
The geniso, genliso and gensdsk scripts contain hard-coded temporary directory names, and so could potentially collide with each other when run as part of a concurrent build (e.g. "make -j 4"). Fix by using mktemp to generate suitable temporary directory names.pull/1/head
parent
b570c2efd8
commit
f42b2932f8
|
@ -22,8 +22,7 @@ then
|
||||||
fi
|
fi
|
||||||
out=$1
|
out=$1
|
||||||
shift
|
shift
|
||||||
dir=bin/iso.dir
|
dir=`mktemp -d bin/iso.dir.XXXXXX`
|
||||||
mkdir -p $dir
|
|
||||||
cfg=$dir/isolinux.cfg
|
cfg=$dir/isolinux.cfg
|
||||||
cp -p $isolinux_bin $dir
|
cp -p $isolinux_bin $dir
|
||||||
cat > $cfg <<EOF
|
cat > $cfg <<EOF
|
||||||
|
|
|
@ -26,13 +26,12 @@ esac
|
||||||
out=$1
|
out=$1
|
||||||
shift
|
shift
|
||||||
|
|
||||||
dir=bin/liso.dir
|
dir=`mktemp -d bin/liso.dir.XXXXXX`
|
||||||
mkdir -p $dir
|
|
||||||
|
|
||||||
img=$dir/boot.img
|
img=$dir/boot.img
|
||||||
mformat -f 1440 -C -i $img ::
|
mformat -f 1440 -C -i $img ::
|
||||||
|
|
||||||
cfg=bin/syslinux.cfg
|
cfg=$dir/syslinux.cfg
|
||||||
cat > $cfg <<EOF
|
cat > $cfg <<EOF
|
||||||
# These default options can be changed in the genliso script
|
# These default options can be changed in the genliso script
|
||||||
SAY gPXE ISO boot image generated by genliso
|
SAY gPXE ISO boot image generated by genliso
|
||||||
|
|
|
@ -24,11 +24,10 @@ Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
|
||||||
esac
|
esac
|
||||||
img=$1
|
img=$1
|
||||||
shift
|
shift
|
||||||
dir=bin/sdsk.dir
|
dir=`mktemp -d bin/sdsk.dir.XXXXXX`
|
||||||
mkdir -p $dir
|
|
||||||
|
|
||||||
mformat -f 1440 -C -i $img ::
|
mformat -f 1440 -C -i $img ::
|
||||||
cfg=bin/syslinux.cfg
|
cfg=$dir/syslinux.cfg
|
||||||
cat > $cfg <<EOF
|
cat > $cfg <<EOF
|
||||||
|
|
||||||
# These default options can be changed in the gensdsk script
|
# These default options can be changed in the gensdsk script
|
||||||
|
|
Loading…
Reference in New Issue