Skip to contentSkip to conversation

UML - Build cleanups

PATCH In review Jeff Dike 2 participants 4 messages Nov 24, 2004 – Nov 29, 2004 User-mode Linux (UML)

lore
Share & tools
lore

Jeff Dike

author
#0 lore raw

PATCH 1/1 UML - Build cleanups

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.

arch/um/Makefile +10 -7
Index: 2.6.9/arch/um/Makefile
===================================================================
@@ -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) $@
#1 lore raw
Quoted 1 line · Jeff Dike

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

Andrew, drop this please... it's totally unneeded and the changelog is wrong.

Quoted 4 lines

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.

Quoted 2 lines
arch/um/Makefile +2 -0
+include/linux/version.h: arch/$(ARCH)/Makefile
+
Signature · 3 lines
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade
author
#2 lore raw
Quoted 1 line · [email protected] 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

#3 lore raw
Quoted 5 lines · Jeff Dike
Quoted 1 line · [email protected] 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.

Quoted 3 lines

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...

Quoted 1 line

Jeff

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