[PATCH] UML - Build cleanups

[PATCH] UML - Build cleanups

[Jeff Dike]

Uml-specific patch (which requires a mainline hook, mailed separately).

This patch avoid the linking kludge which leaves kbuild link vmlinux and
then link it with libc inside linux. This kludge has the big problem of
making kallsyms break, since the kallsyms pass is done on a completely
different binary than the running one.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: 2.6.9/arch/um/Makefile
===================================================================
--- 2.6.9.orig/arch/um/Makefile	2004-11-24 15:27:12.000000000 -0500
+++ 2.6.9/arch/um/Makefile	2004-11-24 15:30:26.000000000 -0500
@@ -65,11 +65,6 @@
 
 .PHONY: linux
 
-all: linux
-
-linux: vmlinux
-	ln -f $< $@
-
 define archhelp
   echo '* linux		- Binary kernel image (./linux) - for backward'
   echo '		   compatibility only, this creates a hard link to the'
@@ -77,6 +72,14 @@
   echo '		   find in the kernel root.'
 endef
 
+all : linux
+
+linux : vmlinux
+	$(RM) $@
+	ln $< $@
+
+include/linux/version.h: arch/$(ARCH)/Makefile
+
 prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
 	$(ARCH_DIR)/kernel/vmlinux.lds.S
 
@@ -150,8 +153,8 @@
 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
 		-o -name '*.gcov' \) -type f -print | xargs rm -f
 
-#We need to re-preprocess this when the symlink dest changes.
-#So we touch it.
+# We need to re-preprocess this when the symlink dest changes.
+# So we touch it.
 $(ARCH_DIR)/kernel/vmlinux.lds.S: FORCE
 	@echo '  SYMLINK $@'
 	$(Q)ln -sf $(LD_SCRIPT-y) $@

Re: [PATCH] UML - Build cleanups

[Blaisorblade]

On Thursday 25 November 2004 00:05, Jeff Dike wrote:
> Uml-specific patch (which requires a mainline hook, mailed separately).
Andrew, drop this please... it's totally unneeded and the changelog is wrong.

> This patch avoid the linking kludge which leaves kbuild link vmlinux and
> then link it with libc inside linux. This kludge has the big problem of
> making kallsyms break, since the kallsyms pass is done on a completely
> different binary than the running one.

Jeff, sometimes you should upgrade changelogs... also, I'm working on Kbuild & 
UML interaction, so please send me Kbuild related patches, to avoid 
inconveniences like rejects for me and let me clean up patches...

In particular, this patch reverts some changes I did and especially readds 
this, which is a residual from when we set EXTRAVERSION in arch/um/Makefile 
so that the dependency was needed.

> +include/linux/version.h: arch/$(ARCH)/Makefile
> +

-- 
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade

Re: [PATCH] UML - Build cleanups

[Jeff Dike]

blaisorblade_spam@yahoo.it said:
> Jeff, sometimes you should upgrade changelogs...

I've had that patch sitting in my queue for ages.  You can always send me an
update to it.

I didn't change the chnagelog because I'm considering that to be part of the
Signed-off-by material.  If I change it, then it's no longer your creation.

				Jeff

Re: [PATCH] UML - Build cleanups

[Blaisorblade]

On Sunday 28 November 2004 21:14, Jeff Dike wrote:
> blaisorblade_spam@yahoo.it said:
> > Jeff, sometimes you should upgrade changelogs...
>
> I've had that patch sitting in my queue for ages.  You can always send me
> an update to it.
Yes, always forgot doing that.
> I didn't change the chnagelog because I'm considering that to be part of
> the Signed-off-by material.  If I change it, then it's no longer your
> creation.
Well, it's my GPL-compatible licensed patch, so you have the full right to 
modify it and to also Sign Off By it (patch-scripts can be configured to 
Sign-Off every patch you forward to someone else) - and fixing the changelog 
is a good idea.

Also, there is 0 code lines from me in this specific patch, actually...
>     Jeff

-- 
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade