[Xen-changelog] [xen-unstable] Revert 16065:671dcd08e806 and try again to fix the issue.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191504071 -3600
# Node ID 65c4977850d71c759062019bee3e62c3d335e439
# Parent  56b543dd0da23176662d1a50efdbb3222f1e64a1
Revert 16065:671dcd08e806 and try again to fix the issue.

Changing LINUX_VER causes us to clone the wrong repository so instead
use the kernel's "kernelrelease" target to figure out the correct
Linux version.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 buildconfigs/mk.linux-2.6-xen |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r 56b543dd0da2 -r 65c4977850d7 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Thu Oct 04 13:52:51 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-xen     Thu Oct 04 14:21:11 2007 +0100
@@ -1,5 +1,5 @@ LINUX_SERIES = 2.6
 LINUX_SERIES = 2.6
-LINUX_VER    ?= 2.6.18.8
+LINUX_VER    ?= 2.6.18
 
 EXTRAVERSION ?= -xen
 
@@ -48,6 +48,8 @@ XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
 XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
 endif
 
+KERNELRELEASE = $(shell $(MAKE) -s --no-print-directory -C $(LINUX_DIR) 
kernelrelease)
+
 # The real action starts here!
 .PHONY: build
 build: $(LINUX_DIR)/include/linux/autoconf.h
@@ -67,9 +69,9 @@ endif
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) 
$(IMAGE_TARGET)
        mkdir -p $(INSTALL_BOOT_PATH)
-       cp $(LINUX_DIR)/$(IMAGE_PATH) 
$(INSTALL_BOOT_PATH)/vmlinuz-$(LINUX_VER)$(EXTRAVERSION)
-       cp $(LINUX_DIR)/.config 
$(INSTALL_BOOT_PATH)/config-$(LINUX_VER)$(EXTRAVERSION)
-       cp $(LINUX_DIR)/System.map 
$(INSTALL_BOOT_PATH)/System.map-$(LINUX_VER)$(EXTRAVERSION)
+       cp $(LINUX_DIR)/$(IMAGE_PATH) 
$(INSTALL_BOOT_PATH)/vmlinuz-$(KERNELRELEASE)
+       cp $(LINUX_DIR)/.config $(INSTALL_BOOT_PATH)/config-$(KERNELRELEASE)
+       cp $(LINUX_DIR)/System.map 
$(INSTALL_BOOT_PATH)/System.map-$(KERNELRELEASE)
 
 $(LINUX_DIR)/include/linux/autoconf.h: 
CONFIG_FILE=$(CURDIR)/$(LINUX_DIR)/.config
 $(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog