[patch 1/1] uml: no extraversion in arch/um/Makefile for mainline

blaisorblade_spam_at_yahoo.it
Date: 09/06/04

  • Next message: Andi Kleen: "Re: [PATCH][8/8] Arch agnostic completely out of line locks / x86_64"
    To: akpm@osdl.org
    Date:	Mon, 06 Sep 2004 19:35:24 +0200
    
    

    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
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at  http://www.tux.org/lkml/
    

  • Next message: Andi Kleen: "Re: [PATCH][8/8] Arch agnostic completely out of line locks / x86_64"

    Relevant Pages