aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-12-20 12:52:38 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-12-20 12:52:38 +0100
commitee5168b91f1a1791d0f530c175dc88d05d2a0bea (patch)
tree37c6feee13bf40e602804d322064ccb6b8db997f
parentb5bdea9ad60fb7d0be72cbfb01a2e31625e7ae88 (diff)
downloadxen-ee5168b91f1a1791d0f530c175dc88d05d2a0bea.tar.gz
xen-ee5168b91f1a1791d0f530c175dc88d05d2a0bea.tar.bz2
xen-ee5168b91f1a1791d0f530c175dc88d05d2a0bea.zip
Currently there is no generic configure file to compile xenlinux on
ia64, since there're several different system types like HP-ZX, DIG, etc. Current Makefile can't meet this need and default one (xen0_defconfig_ia64) is only for HP-ZX type. Hence, this patch can append an additional param to configuration file name to differentiate system types when make. Signed-off-by Zhang Xiantao <xiantao.zhang@intel.com>
-rw-r--r--Makefile2
-rw-r--r--buildconfigs/mk.linux-2.6-xen2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a7eecc8217..f9f80d1e9f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildc
# Export target architecture overrides to Xen and Linux sub-trees.
ifneq ($(XEN_TARGET_ARCH),)
SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
-export XEN_TARGET_ARCH SUBARCH
+export XEN_TARGET_ARCH SUBARCH XEN_SYSTYPE
endif
# Default target must appear before any include lines
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 16e7e9d281..dad9348b0a 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -30,7 +30,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
- || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
+ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH)$(XEN_SYSTYPE) \
$(LINUX_DIR)/.config
# See if we need to munge config to enable PAE
$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae