linux-um archives
 help / color / mirror / Atom feed
* [uml-devel] [patch 1/1] uml: no extraversion in arch/um/Makefile for mainline
@ 2004-09-06 17:35 blaisorblade_spam
  2004-09-06 18:36 ` [uml-devel] " Christoph Hellwig
  0 siblings, 1 reply; 5+ messages in thread
From: blaisorblade_spam @ 2004-09-06 17:35 UTC (permalink / raw)
  To: akpm; +Cc: jdike, linux-kernel, user-mode-linux-devel, blaisorblade_spam


Extraversion in arch/um/Makefile is not needed in mainline, but just for
separate patches; also, they should set it in the main Makefile, not elsewhere
(Jeff Garzik has just complained).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---

 uml-linux-2.6.8.1-paolo/arch/um/Makefile |    9 ---------
 1 files changed, 9 deletions(-)

diff -puN arch/um/Makefile~uml-no-extraversion-in-mainline arch/um/Makefile
--- uml-linux-2.6.8.1/arch/um/Makefile~uml-no-extraversion-in-mainline	2004-09-06 19:23:08.400492544 +0200
+++ uml-linux-2.6.8.1-paolo/arch/um/Makefile	2004-09-06 19:24:05.342835992 +0200
@@ -10,13 +10,6 @@ SHELL := /bin/bash
 
 filechk_gen_header = $<
 
-# Recalculate MODLIB to reflect the EXTRAVERSION changes (via KERNELRELEASE)
-# The way the toplevel Makefile is written EXTRAVERSION is not supposed
-# to be changed outside the toplevel Makefile, but recalculating MODLIB is
-# a sufficient workaround until we no longer need architecture dependent
-# EXTRAVERSION...
-MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
-
 core-y			+= $(ARCH_DIR)/kernel/		\
 			   $(ARCH_DIR)/drivers/		\
 			   $(ARCH_DIR)/sys-$(SUBARCH)/
@@ -44,8 +37,6 @@ SYS_DIR		:= $(ARCH_DIR)/include/sysdep-$
 include $(ARCH_DIR)/Makefile-$(SUBARCH)
 include $(ARCH_DIR)/Makefile-os-$(OS)
 
-EXTRAVERSION := $(EXTRAVERSION)-1um
-
 # -Derrno=kernel_errno - This turns all kernel references to errno into
 # kernel_errno to separate them from the libc errno.  This allows -fno-common
 # in CFLAGS.  Otherwise, it would cause ld to complain about the two different
_


-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2004-09-07 23:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-06 17:35 [uml-devel] [patch 1/1] uml: no extraversion in arch/um/Makefile for mainline blaisorblade_spam
2004-09-06 18:36 ` [uml-devel] " Christoph Hellwig
2004-09-07 18:16   ` BlaisorBlade
2004-09-07 21:26     ` Andrew Morton
2004-09-08  0:16       ` Jeff Dike

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox