ia64/xen-unstable

changeset 2724:2c4a115fcca1

bitkeeper revision 1.1159.1.266 (417a3d98CeFiS9Vj2SKKSNciHhZF2g)

Sanitise the Linux version numbers. No stupid pathname magic.
author kaf24@freefall.cl.cam.ac.uk
date Sat Oct 23 11:16:40 2004 +0000 (2004-10-23)
parents 76c5af12d4aa
children a21ac4621c09
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	Fri Oct 22 20:15:02 2004 +0000
     1.2 +++ b/Makefile	Sat Oct 23 11:16:40 2004 +0000
     1.3 @@ -80,28 +80,28 @@ endif
     1.4  CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
     1.5  ifeq ($(LINUX_RELEASE),2.4)
     1.6  config-xen%:
     1.7 -	$(MAKE) -C $(CDIR) ARCH=xen mrproper
     1.8 -	cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
     1.9 +	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
    1.10 +	cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \
    1.11  	    $(CDIR)/.config || \
    1.12 -	    $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
    1.13 -	$(MAKE) -C $(CDIR) ARCH=xen oldconfig
    1.14 -	$(MAKE) -C $(CDIR) ARCH=xen dep
    1.15 +	    $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_config
    1.16 +	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) oldconfig
    1.17 +	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) dep
    1.18  else
    1.19  config-xen%:
    1.20 -	$(MAKE) -C $(CDIR) ARCH=xen mrproper
    1.21 +	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
    1.22  	@[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
    1.23  	  && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
    1.24  		$(CDIR)/.config || \
    1.25 -	$(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig
    1.26 +	$(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_defconfig
    1.27  endif
    1.28  
    1.29  # build the specified linux tree
    1.30  BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
    1.31  linux-xen%:	
    1.32 -	$(MAKE) -C $(BDIR) ARCH=xen modules
    1.33 -	$(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \
    1.34 +	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) modules
    1.35 +	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_MOD_PATH=$(INSTALL_DIR) \
    1.36  	    modules_install
    1.37 -	$(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    1.38 +	$(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_PATH=$(INSTALL_DIR) install
    1.39  
    1.40  
    1.41  NETBSD_RELEASE   ?= 2.0
     2.1 --- a/linux-2.4.27-xen-sparse/arch/xen/Makefile	Fri Oct 22 20:15:02 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile	Sat Oct 23 11:16:40 2004 +0000
     2.3 @@ -16,7 +16,8 @@
     2.4  #           Added '-march' and '-mpreferred-stack-boundary' support
     2.5  #
     2.6  
     2.7 -override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
     2.8 +XENVERSION   ?= -xen
     2.9 +EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
    2.10  
    2.11  # If no .config file exists then use the appropriate defconfig-* file
    2.12  ifneq (.config,$(wildcard .config))
     3.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile	Fri Oct 22 20:15:02 2004 +0000
     3.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile	Sat Oct 23 11:16:40 2004 +0000
     3.3 @@ -12,8 +12,8 @@
     3.4  # Copyright (C) 2004 by Christian Limpach
     3.5  #
     3.6  
     3.7 -EXTRAEXTRAVERSION=$(subst $(findstring $(EXTRAVERSION),$(shell basename $(TOPDIR))),,$(EXTRAVERSION))
     3.8 -override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAEXTRAVERSION)
     3.9 +XENVERSION   ?= -xen
    3.10 +EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
    3.11  
    3.12  XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
    3.13