zImage.miboot and vmlinux.lds

zImage.miboot and vmlinux.lds

[Christian Kujau]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 331 bytes --]

Hi,

when doing a "make mrproper" or even "make distclean" on a current 
2.6-git tree, I see 2 files being left over:

arch/powerpc/boot/zImage.miboot
arch/powerpc/kernel/vmlinux.lds

The attached 1-liner "fixes" this but I wonder why they've been kept at 
all.

thanks,
Christian
-- 
BOFH excuse #23:

improperly oriented keyboard

[-- Attachment #2: Type: TEXT/x-diff, Size: 354 bytes --]

--- linux-2.6-dev/arch/powerpc/Makefile.orig	2007-05-28 21:24:39.000000000 +0200
+++ linux-2.6-dev/arch/powerpc/Makefile	2007-05-28 21:23:25.000000000 +0200
@@ -175,6 +175,7 @@ archclean:
 
 archmrproper:
 	$(Q)rm -rf arch/$(ARCH)/include
+	$(Q)rm  -f arch/$(ARCH)/boot/zImage.miboot arch/$(ARCH)/kernel/vmlinux.lds 
 
 archprepare: checkbin
 

Re: zImage.miboot and vmlinux.lds

[Christian Kujau]

On Mon, 28 May 2007, Christian Kujau wrote:
> when doing a "make mrproper" or even "make distclean" on a current 2.6-git 
> tree, I see 2 files being left over:
>
> arch/powerpc/boot/zImage.miboot
> arch/powerpc/kernel/vmlinux.lds

Hm, the files are still there. Is there any reason for "mrproper" not to 
remove these files? Otherwise, would the following be appropriate?

--- linux-2.6-dev/arch/powerpc/Makefile.orig	2007-05-28 21:24:39.000000000 +0200
+++ linux-2.6-dev/arch/powerpc/Makefile	2007-05-28 21:23:25.000000000 +0200
@@ -174,6 +174,7 @@ archclean:

  archmrproper:
  	$(Q)rm -rf arch/$(ARCH)/include
+	$(Q)rm  -f arch/$(ARCH)/boot/zImage.miboot arch/$(ARCH)/kernel/vmlinux.lds

  archprepare: checkbin


Thanks,
Christian.
-- 
make bzImage, not war

Re: zImage.miboot and vmlinux.lds

[Segher Boessenkool]

> Hm, the files are still there. Is there any reason for "mrproper" not 
> to
> remove these files? Otherwise, would the following be appropriate?
>
> --- linux-2.6-dev/arch/powerpc/Makefile.orig	2007-05-28 
> 21:24:39.000000000 +0200
> +++ linux-2.6-dev/arch/powerpc/Makefile	2007-05-28 21:23:25.000000000 
> +0200
> @@ -174,6 +174,7 @@ archclean:
>
>   archmrproper:
>   	$(Q)rm -rf arch/$(ARCH)/include
> +	$(Q)rm  -f arch/$(ARCH)/boot/zImage.miboot 
> arch/$(ARCH)/kernel/vmlinux.lds

vmlinux.lds should be cleaned from the main (non-arch)
Makefile; I could swear I've sent a patch for that some
time ago.

zImage.miboot should be added to $(clean-files) in
arch/powerpc/boot/Makefile; the $(image-) in there
should catch it except for the ifeq in

ifeq ($(CONFIG_PPC32),y)
image-$(CONFIG_PPC_PMAC)        += zImage.coff zImage.miboot
endif

Maybe it should be added to $(image-) unconditionally?
Or get rid of the ifeq, preferably.


Segher

Re: zImage.miboot and vmlinux.lds

[Christian Kujau]

On Sat, 9 Jun 2007, Segher Boessenkool wrote:
> vmlinux.lds should be cleaned from the main (non-arch)
> Makefile; I could swear I've sent a patch for that some
> time ago.

Well, Stephen Rothwell did (too?) and you replied to his post:
http://article.gmane.org/gmane.linux.ports.ppc.devel/5881
http://article.gmane.org/gmane.linux.ports.ppc.devel/5897

> Maybe it should be added to $(image-) unconditionally?
> Or get rid of the ifeq, preferably.

What about just adding it to clean-files, since $(image-) does not seem 
to catch it?

--- linux-2.6.22-rc3.orig/arch/powerpc/boot/Makefile	2007-05-26 04:55:14.000000000 +0200
+++ linux-2.6.22-rc3/arch/powerpc/boot/Makefile	2007-06-09 23:38:07.000000000 +0200
@@ -81,7 +81,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds
  	@cp $< $@

  clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-		empty.c zImage.coff.lds zImage.lds
+		empty.c zImage.coff.lds zImage.lds zImage.miboot

  quiet_cmd_bootcc = BOOTCC  $@
        cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<


-- 
make bzImage, not war

Re: zImage.miboot and vmlinux.lds

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]

On Sat, 9 Jun 2007 23:39:20 +0200 (CEST) Christian Kujau <lists@nerdbynature.de> wrote:
>
> On Sat, 9 Jun 2007, Segher Boessenkool wrote:
> > vmlinux.lds should be cleaned from the main (non-arch)
> > Makefile; I could swear I've sent a patch for that some
> > time ago.
> 
> Well, Stephen Rothwell did (too?) and you replied to his post:
> http://article.gmane.org/gmane.linux.ports.ppc.devel/5881

That patch actually removed vmlinux.lds for the repository as it had
become a generated file i.e. the patch did not add rules to the Makefile
to remove the file for mrproper.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]