ia64/xen-unstable

changeset 2726:4cec04241b9b

bitkeeper revision 1.1159.1.268 (417a99cddcYDzBoICm2bmzocJ2wt4A)

Remove all the XENVERSION/EXTRAVERSION stuff after all.
Patch root Linux Makefile from repository master Makefile.
author kaf24@freefall.cl.cam.ac.uk
date Sat Oct 23 17:50:05 2004 +0000 (2004-10-23)
parents a21ac4621c09
children 65295b0e2e99
files Makefile linux-2.4.27-xen-sparse/arch/xen/Makefile linux-2.6.8.1-xen-sparse/arch/xen/Makefile
line diff
     1.1 --- a/Makefile	Sat Oct 23 12:28:56 2004 +0000
     1.2 +++ b/Makefile	Sat Oct 23 17:50:05 2004 +0000
     1.3 @@ -64,7 +64,12 @@ mk-linux-trees: patches/ebtables.diff pr
     1.4            ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
     1.5  	cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
     1.6  	( cd linux-$(LINUX_VER)-xen0 ; \
     1.7 -          patch -p1 -F3 < ../patches/ebtables.diff )
     1.8 +          patch -p1 -F3 < ../patches/ebtables.diff ; \
     1.9 +          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
    1.10 +          rm -f Makefile ; mv Mk.tmp Makefile )
    1.11 +	( cd linux-$(LINUX_VER)-xenU ; \
    1.12 +          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
    1.13 +          rm -f Makefile ; mv Mk.tmp Makefile )
    1.14  else
    1.15  mk-linux-trees: pristine-linux-src 
    1.16  	$(RM) -rf $(LINUX_TREES)
    1.17 @@ -74,35 +79,40 @@ mk-linux-trees: pristine-linux-src
    1.18  	( cd linux-$(LINUX_VER)-xen-sparse ; \
    1.19            ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
    1.20  	cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
    1.21 +	( cd linux-$(LINUX_VER)-xen0 ; \
    1.22 +          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
    1.23 +          rm -f Makefile ; mv Mk.tmp Makefile )
    1.24 +	( cd linux-$(LINUX_VER)-xenU ; \
    1.25 +          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
    1.26 +          rm -f Makefile ; mv Mk.tmp Makefile )
    1.27  endif
    1.28  
    1.29  # configure the specified linux tree
    1.30  CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
    1.31  ifeq ($(LINUX_RELEASE),2.4)
    1.32  config-xen%:
    1.33 -	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
    1.34 +	$(MAKE) -C $(CDIR) ARCH=xen mrproper
    1.35  	cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \
    1.36  	    $(CDIR)/.config || \
    1.37 -	    $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_config
    1.38 -	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) oldconfig
    1.39 -	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) dep
    1.40 +	    $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
    1.41 +	$(MAKE) -C $(CDIR) ARCH=xen oldconfig
    1.42 +	$(MAKE) -C $(CDIR) ARCH=xen dep
    1.43  else
    1.44  config-xen%:
    1.45 -	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
    1.46 +	$(MAKE) -C $(CDIR) ARCH=xen mrproper
    1.47  	@[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
    1.48  	  && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
    1.49  		$(CDIR)/.config || \
    1.50 -	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_defconfig
    1.51 +	$(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig
    1.52  endif
    1.53  
    1.54  # build the specified linux tree
    1.55  BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
    1.56  linux-xen%:	
    1.57 -	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) modules
    1.58 -	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_MOD_PATH=$(INSTALL_DIR) \
    1.59 +	$(MAKE) -C $(BDIR) ARCH=xen modules
    1.60 +	$(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \
    1.61  	    modules_install
    1.62 -	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_PATH=$(INSTALL_DIR) install
    1.63 -
    1.64 +	$(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    1.65  
    1.66  NETBSD_RELEASE   ?= 2.0
    1.67  NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \
     2.1 --- a/linux-2.4.27-xen-sparse/arch/xen/Makefile	Sat Oct 23 12:28:56 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile	Sat Oct 23 17:50:05 2004 +0000
     2.3 @@ -16,9 +16,6 @@
     2.4  #           Added '-march' and '-mpreferred-stack-boundary' support
     2.5  #
     2.6  
     2.7 -XENVERSION   ?= $(shell cat .extraversion 2>/dev/null || echo "-xen")
     2.8 -EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
     2.9 -
    2.10  # If no .config file exists then use the appropriate defconfig-* file
    2.11  ifneq (.config,$(wildcard .config))
    2.12  DUMMYX:=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)
     3.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile	Sat Oct 23 12:28:56 2004 +0000
     3.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile	Sat Oct 23 17:50:05 2004 +0000
     3.3 @@ -12,9 +12,6 @@
     3.4  # Copyright (C) 2004 by Christian Limpach
     3.5  #
     3.6  
     3.7 -XENVERSION   ?= $(shell cat .extraversion 2>/dev/null || echo "-xen")
     3.8 -EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
     3.9 -
    3.10  XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
    3.11  
    3.12  # pick up headers from include/asm-xen/asm in preference over include/asm