diff options
| author | Keir Fraser <keir@xensource.com> | 2007-10-04 14:21:11 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xensource.com> | 2007-10-04 14:21:11 +0100 |
| commit | 3f943baffcc13bcad539cb653d25a81d5559c3d4 (patch) | |
| tree | 5c634b60b93552cb3fe6eb881ba1e361c1dafafe /buildconfigs | |
| parent | a687f4cc2f600f4b81c87b9061c082ad26d79f2c (diff) | |
| download | xen-3f943baffcc13bcad539cb653d25a81d5559c3d4.tar.gz xen-3f943baffcc13bcad539cb653d25a81d5559c3d4.tar.bz2 xen-3f943baffcc13bcad539cb653d25a81d5559c3d4.zip | |
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@xensource.com>
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 2b684e54e7..e8c5be6ea0 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -1,5 +1,5 @@ LINUX_SERIES = 2.6 -LINUX_VER ?= 2.6.18.8 +LINUX_VER ?= 2.6.18 EXTRAVERSION ?= -xen @@ -48,6 +48,8 @@ ifndef XEN_LINUX_ALLOW_INTERFACE_MISMATCH 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 |