From: David Woodhouse Date: Mon, 3 Dec 2007 02:48:03 +0000 (+1100) Subject: [POWERPC] Create otheros.bld next to specified output file, not in $object directory X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=928b9695592921957289d038ee75f613d9485a0a;p=deliverable%2Flinux.git [POWERPC] Create otheros.bld next to specified output file, not in $object directory The bootwrapper script currently generates an 'otheros.bld' file in addition to the file specified by the -o option, when asked to build a wrapper for PS3. It should do that in the same directory as the output, not the directory where the wrapper objects are kept (which might potentially not be writable when the script runs). Arguably, the 'otheros.bld' ought to be created with the filename specified as the -o argument. But that's a more intrusive change. Signed-off-by: David Woodhouse Acked-by: Geoff Levand Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 31147a037728..221b8c87f57e 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -287,8 +287,6 @@ ps3) overlay_dest="256" overlay_size="256" - rm -f "$object/otheros.bld" - ${CROSS}objcopy -O binary "$ofile" "$ofile.bin" dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \ @@ -299,6 +297,8 @@ ps3) skip=$system_reset_overlay seek=$overlay_dest \ count=$overlay_size bs=1 - gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld" + odir="$(dirname "$ofile.bin")" + rm -f "$odir/otheros.bld" + gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld" ;; esac