diff options
author | Milton Miller <miltonm@bga.com> | 2007-03-28 04:21:04 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:16 -0400 |
commit | 1383a34fafeb9f49975fc33783960729fbd2cddf (patch) | |
tree | d5662d26786ba64862bab20e98a601b268fc25c4 /arch/powerpc/boot | |
parent | f4bdbfc41b3cad813745f64fb849c298770da517 (diff) |
[POWERPC] bootwrapper: no-gzip fixes
Commit a9903811bf8d130a26004f9cb27b66513a267908 missed two uses of the
the .gz suffix in the wrapper script and didn't clean the additonal
possibly cached files.
Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/Makefile | 8 | ||||
-rwxr-xr-x | arch/powerpc/boot/wrapper | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index be001d923d3f..928b88a55d05 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -170,5 +170,11 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) | |||
170 | install: $(CONFIGURE) $(image-y) | 170 | install: $(CONFIGURE) $(image-y) |
171 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 171 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
172 | 172 | ||
173 | clean-files += $(addprefix $(objtree)/, vmlinux.strip.gz vmlinux.bin.gz) | 173 | # anything not in $(targets) |
174 | clean-files += $(image-) $(initrd-) zImage zImage.initrd | 174 | clean-files += $(image-) $(initrd-) zImage zImage.initrd |
175 | |||
176 | # clean up files cached by wrapper | ||
177 | clean-kernel := vmlinux.strip vmlinux.bin | ||
178 | clean-kernel += $(addsuffix .gz,$(clean-kernel)) | ||
179 | # If not absolute clean-files are relative to $(obj). | ||
180 | clean-files += $(addprefix $(objtree)/, $(clean-kernel)) | ||
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index f9238f53c1f3..e4566bdfbe00 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -144,7 +144,7 @@ miboot|uboot) | |||
144 | esac | 144 | esac |
145 | 145 | ||
146 | vmz="$tmpdir/`basename \"$kernel\"`.$ext" | 146 | vmz="$tmpdir/`basename \"$kernel\"`.$ext" |
147 | if [ -z "$cacheit" -o ! -f "$vmz.gz" -o "$vmz.gz" -ot "$kernel" ]; then | 147 | if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then |
148 | ${CROSS}objcopy $objflags "$kernel" "$vmz.$$" | 148 | ${CROSS}objcopy $objflags "$kernel" "$vmz.$$" |
149 | 149 | ||
150 | if [ -n "$gzip" ]; then | 150 | if [ -n "$gzip" ]; then |