[PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[Wu Zhangjin]

Manuel Lauss have reported:

"when I change the compression type in a built tree, the compressed/ directoryy
doesn't get rebuilt and a stale vmlinuz remains"

This patch fixes it.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
 arch/mips/Makefile                 |    2 +-
 arch/mips/boot/compressed/Makefile |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 05bcf99..c240f7d 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -712,7 +712,7 @@ makezboot =$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
 
 all:	$(all-y)
 
-vmlinuz: vmlinux
+vmlinuz: vmlinux FORCE
 	+@$(call makezboot,$@)
 
 vmlinuz.bin: vmlinux
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 5cf9b46..90e5879 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -49,20 +49,17 @@ tool_$(CONFIG_KERNEL_LZMA)    = lzma
 tool_$(CONFIG_KERNEL_LZO)    = lzo
 $(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin
 	$(call if_changed,$(tool_y))
-	$(Q)rm -f $<
 
 $(obj)/piggy.o: $(obj)/vmlinux.$(suffix_y) $(obj)/dummy.o
 	$(Q)$(OBJCOPY) $(OBJCOPYFLAGS) \
 		--add-section=.image=$< \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
 		$(obj)/dummy.o $@
-	$(Q)rm -f $<
 
 LDFLAGS_vmlinuz := $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T
 vmlinuz: $(src)/ld.script $(obj-y) $(obj)/piggy.o
 	$(call if_changed,ld)
 	$(Q)$(OBJCOPY) $(OBJCOPYFLAGS) -R .comment -R .stab -R .stabstr -R .initrd -R .sysmap $@
-	$(Q)rm -f $(obj)/piggy.o
 
 #
 # Some DECstations need all possible sections of an ECOFF executable
-- 
1.6.2.1

Re: [PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[Manuel Lauss]

On Wed, Oct 14, 2009 at 1:11 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> Manuel Lauss have reported:
>
> "when I change the compression type in a built tree, the compressed/ directoryy
> doesn't get rebuilt and a stale vmlinuz remains"
>
> This patch fixes it.

Works perfectly, thank you!
     Manuel Lauss

Re: [PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[Ralf Baechle]

On Wed, Oct 14, 2009 at 07:11:52PM +0800, Wu Zhangjin wrote:

Thanks, folded into the existing compression patch.

  Ralf

Re: [PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[Wu Zhangjin]

Hi Ralf,

I have updated my git repository to your master branch, and plan to push
the basic support of fuloong2f to you and also the linux-mips mailing
list, is it okay? any suggestion?

and of course, will not push a bunch of them, only 3 or 5 patches one
time.

Thanks & Regards,
	Wu Zhangjin 

On Wed, 2009-10-14 at 13:44 +0200, Ralf Baechle wrote:
> On Wed, Oct 14, 2009 at 07:11:52PM +0800, Wu Zhangjin wrote:
> 
> Thanks, folded into the existing compression patch.
> 
>   Ralf

Re: [PATCH] MIPS: zboot: make the vmlinuz be fresh all the time

[Ralf Baechle]

On Thu, Oct 15, 2009 at 01:53:39PM +0800, Wu Zhangjin wrote:

> I have updated my git repository to your master branch, and plan to push
> the basic support of fuloong2f to you and also the linux-mips mailing
> list, is it okay? any suggestion?

Sure, go ahead.  It would be appreciated if you would rebase your code
to the queue branch of linux-queue.git for submission; this will
minimize merge conflicts.

  Ralf