* [patch 03/10] uml: no extraversion in arch/um/Makefile for mainline
@ 2004-10-12 0:17 blaisorblade_spam
0 siblings, 0 replies; only message in thread
From: blaisorblade_spam @ 2004-10-12 0:17 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). Also remove the dependency from version.h
on arch/um/Makefile: it was added because arch/um/Makefile could change the
kernel version number.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---
linux-2.6.9-current-paolo/arch/um/Makefile | 9 ---------
1 files changed, 9 deletions(-)
diff -puN arch/um/Makefile~uml-no-extraversion-in-mainline arch/um/Makefile
--- linux-2.6.9-current/arch/um/Makefile~uml-no-extraversion-in-mainline 2004-10-12 00:39:57.768983440 +0200
+++ linux-2.6.9-current-paolo/arch/um/Makefile 2004-10-12 00:40:11.263931896 +0200
@@ -8,13 +8,6 @@ OS := $(shell uname -s)
#We require it or things break.
SHELL := /bin/bash
-# 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)/
@@ -73,8 +66,6 @@ ifeq ($(CONFIG_MODE_SKAS), y)
$(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
endif
-include/linux/version.h: arch/$(ARCH)/Makefile
-
$(ARCH_DIR)/vmlinux.lds.S :
touch $@
_
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-10-12 0:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-12 0:17 [patch 03/10] uml: no extraversion in arch/um/Makefile for mainline blaisorblade_spam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).