Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1383a34f authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

[POWERPC] bootwrapper: no-gzip fixes 



Commit a9903811 missed two uses of the
the .gz suffix in the wrapper script and didn't clean the additonal
possibly cached files.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Acked-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f4bdbfc4

arch/powerpc/boot/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -170,5 +170,11 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 
install: $(CONFIGURE) $(image-y)

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<



clean-files += $(addprefix $(objtree)/, vmlinux.strip.gz vmlinux.bin.gz)

# anything not in $(targets)

clean-files += $(image-) $(initrd-) zImage zImage.initrd



# clean up files cached by wrapper

clean-kernel := vmlinux.strip vmlinux.bin

clean-kernel += $(addsuffix .gz,$(clean-kernel))

# If not absolute clean-files are relative to $(obj).

clean-files += $(addprefix $(objtree)/, $(clean-kernel))

arch/powerpc/boot/wrapper

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ miboot|uboot) 
esac



vmz="$tmpdir/`basename \"$kernel\"`.$ext"

if [ -z "$cacheit" -o ! -f "$vmz.gz" -o "$vmz.gz" -ot "$kernel" ]; then

if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then

    ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"



    if [ -n "$gzip" ]; then