1.1 --- a/Makefile	Sun Sep 11 09:28:21 2005 +0000
     1.2 +++ b/Makefile	Sun Sep 11 16:34:38 2005 +0000
     1.3 @@ -10,6 +10,7 @@ INSTALL		:= install
     1.4  INSTALL_DIR	:= $(INSTALL) -d -m0755
     1.5  INSTALL_DATA	:= $(INSTALL) -m0644
     1.6  INSTALL_PROG	:= $(INSTALL) -m0755
     1.7 +XEN_LOCALVERSION:=
     1.8  
     1.9  KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
    1.10  # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
    1.11 @@ -18,6 +19,7 @@ KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
    1.12  XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
    1.13  
    1.14  export DESTDIR
    1.15 +export XEN_LOCALVERSION
    1.16  
    1.17  # Export target architecture overrides to Xen and Linux sub-trees.
    1.18  ifneq ($(XEN_TARGET_ARCH),)

     2.1 --- a/buildconfigs/mk.linux-2.6-xen	Sun Sep 11 09:28:21 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.6-xen	Sun Sep 11 16:34:38 2005 +0000
     2.3 @@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
     2.4  EXTRAVERSION = xen
     2.5  
     2.6  LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
     2.7 +LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
     2.8  
     2.9  include buildconfigs/Rules.mk
    2.10  
    2.11 @@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
    2.12  # The real action starts here!
    2.13  build: $(LINUX_DIR)/include/linux/autoconf.h
    2.14  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
    2.15 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
    2.16 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    2.17 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
    2.18 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    2.19  	fi
    2.20 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    2.21 +	$(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    2.22  
    2.23  $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
    2.24  	rm -rf $(LINUX_DIR)

     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Sun Sep 11 09:28:21 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Sun Sep 11 16:34:38 2005 +0000
     3.3 @@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
     3.4  EXTRAVERSION = xen0
     3.5  
     3.6  LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
     3.7 +LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
     3.8  
     3.9  include buildconfigs/Rules.mk
    3.10  
    3.11 @@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
    3.12  # The real action starts here!
    3.13  build: $(LINUX_DIR)/include/linux/autoconf.h
    3.14  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
    3.15 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
    3.16 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    3.17 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
    3.18 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    3.19  	fi
    3.20 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    3.21 +	$(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    3.22  
    3.23  $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
    3.24  	rm -rf $(LINUX_DIR)

     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Sun Sep 11 09:28:21 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Sun Sep 11 16:34:38 2005 +0000
     4.3 @@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
     4.4  EXTRAVERSION = xenU
     4.5  
     4.6  LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
     4.7 +LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
     4.8  
     4.9  include buildconfigs/Rules.mk
    4.10  
    4.11 @@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
    4.12  # The real action starts here!
    4.13  build: $(LINUX_DIR)/include/linux/autoconf.h
    4.14  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
    4.15 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
    4.16 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    4.17 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
    4.18 +	    $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
    4.19  	fi
    4.20 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    4.21 +	$(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    4.22  
    4.23  $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
    4.24  	rm -rf $(LINUX_DIR)

     5.1 --- a/xen/Makefile	Sun Sep 11 09:28:21 2005 +0000
     5.2 +++ b/xen/Makefile	Sun Sep 11 16:34:38 2005 +0000
     5.3 @@ -11,7 +11,8 @@ INSTALL_DIR		= $(INSTALL) -d -m0755
     5.4  export XEN_VERSION       = 3
     5.5  export XEN_SUBVERSION    = 0
     5.6  export XEN_EXTRAVERSION  = -devel
     5.7 -export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
     5.8 +export XEN_LOCALVERSION  =
     5.9 +export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)$(XEN_LOCALVERSION)
    5.10  
    5.11  export BASEDIR          := $(CURDIR)
    5.12  
    5.13 @@ -32,6 +33,7 @@ build: $(TARGET).gz
    5.14  install: $(TARGET).gz
    5.15  	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
    5.16  	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz
    5.17 +	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_LOCALVERSION).gz
    5.18  	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
    5.19  	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
    5.20  	ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz