ChangeSet 1.1513, 2005/05/23 16:22:15+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
mk.linux-2.6-xenU, mk.linux-2.6-xen0, Rules.mk, Config.mk:
Move {COMPILE,TARGET}_{,SUB}ARCH} definition into xen/Rules.mk.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
Config.mk | 6 ------
buildconfigs/mk.linux-2.6-xen0 | 2 +-
buildconfigs/mk.linux-2.6-xenU | 2 +-
xen/Rules.mk | 6 ++++++
4 files changed, 8 insertions(+), 8 deletions(-)
diff -Nru a/Config.mk b/Config.mk
--- a/Config.mk 2005-05-23 12:06:16 -04:00
+++ b/Config.mk 2005-05-23 12:06:16 -04:00
@@ -4,12 +4,6 @@
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
-# Set ARCH/SUBARCH appropriately.
-override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
-override TARGET_SUBARCH := $(XEN_TARGET_ARCH)
-override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
-override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
-
# Tools to run on system hosting the build
HOSTCC = gcc
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
diff -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0 2005-05-23 12:06:16 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0 2005-05-23 12:06:16 -04:00
@@ -33,7 +33,7 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU 2005-05-23 12:06:16 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU 2005-05-23 12:06:16 -04:00
@@ -33,7 +33,7 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Nru a/xen/Rules.mk b/xen/Rules.mk
--- a/xen/Rules.mk 2005-05-23 12:06:16 -04:00
+++ b/xen/Rules.mk 2005-05-23 12:06:16 -04:00
@@ -10,6 +10,12 @@
include $(BASEDIR)/../Config.mk
+# Set ARCH/SUBARCH appropriately.
+override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
+override TARGET_SUBARCH := $(XEN_TARGET_ARCH)
+override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
+override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
+
TARGET := $(BASEDIR)/xen
HDRS := $(wildcard $(BASEDIR)/include/xen/*.h)
HDRS += $(wildcard $(BASEDIR)/include/public/*.h)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home