Skip to content

Commit

Permalink
[POWERPC] Create otheros.bld next to specified output file, not in $o…
Browse files Browse the repository at this point in the history
…bject 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 <dwmw2@infradead.org>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
David Woodhouse authored and Paul Mackerras committed Dec 6, 2007
1 parent 3a1c81f commit 928b969
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/boot/wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

0 comments on commit 928b969

Please sign in to comment.