On Fri, 2004-03-12 at 13:59, Tahoma Toelkes wrote:
> Dan Malek wrote:
>
> > You will have to get the sources from linux-mips.org cvs,
> > using the linux_2_4 tag. From
> > ftp.linux-mips.org:/pub/linux/mips/people/ppopov/2.4
> > get and apply the usb-nonpci-2.4.24.patch and zboot-2.4.25.patch
>
> I'm having problems applying the zboot patch to the latest and greatest
> from the linux_2_4 branch ("cvs checkout -r linux_2_4 -D 2004-03-12
> linux"). When I try to apply the zboot patch, it rejects the chunk for
> 'arch/mips/Makefile'. However, upon inspection, I am unable to
> determine why it isn't happy with the patch. Any suggestions?
It's not happy because the Makefile has changed since the zboot patch
was last updated. Below is the reject. You can take the "+" lines and
manually insert them in the Makefile or wait until Dan or I update the
patch.
Pete
***************
*** 724,738 ****
endif
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux.ecoff: vmlinux
@$(MAKEBOOT) $@
vmlinux.srec: vmlinux
@$(MAKEBOOT) $@
archclean:
@$(MAKEBOOT) clean
rm -f arch/$(ARCH)/ld.script
$(MAKE) -C arch/$(ARCH)/tools clean
$(MAKE) -C arch/mips/baget clean
--- 724,744 ----
endif
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+ MAKEZBOOT = $(MAKE) -C arch/$(ARCH)/zboot
+ BOOT_TARGETS = zImage zImage.initrd zImage.flash
vmlinux.ecoff: vmlinux
@$(MAKEBOOT) $@
+ $(BOOT_TARGETS): vmlinux
+ @$(MAKEZBOOT) $@
+
vmlinux.srec: vmlinux
@$(MAKEBOOT) $@
archclean:
@$(MAKEBOOT) clean
+ @$(MAKEZBOOT) clean
rm -f arch/$(ARCH)/ld.script
$(MAKE) -C arch/$(ARCH)/tools clean
$(MAKE) -C arch/mips/baget clean
