diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2007-05-30 13:10:20 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2007-05-30 13:10:20 +0100 |
| commit | 0055a08a1aa38080c32d05171169ee1a78f02288 (patch) | |
| tree | 883b820fdfab1c636d994c665a98859809352b96 | |
| parent | ca938d8cc6d30f0c99e631e6fb050ce1c921ab08 (diff) | |
| download | xen-0055a08a1aa38080c32d05171169ee1a78f02288.tar.gz xen-0055a08a1aa38080c32d05171169ee1a78f02288.tar.bz2 xen-0055a08a1aa38080c32d05171169ee1a78f02288.zip | |
Check for mismatch between headers shared by Linux and Xen.
This is only enabled for the linux-2.6-xen tree and is intended to
ensure that the separate Linux tree stays up to date once we
switch away from the sparse tree.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
| -rw-r--r-- | buildconfigs/mk.linux-2.6-native | 3 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-paravirt | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 9 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6.5-SLES-xen | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6.9-RHEL-xen | 2 |
5 files changed, 18 insertions, 0 deletions
diff --git a/buildconfigs/mk.linux-2.6-native b/buildconfigs/mk.linux-2.6-native index 09ed18efde..0541c1319f 100644 --- a/buildconfigs/mk.linux-2.6-native +++ b/buildconfigs/mk.linux-2.6-native @@ -1,4 +1,7 @@ EXTRAVERSION = -native IMAGE_TARGET = bzImage INSTALL_BOOT_PATH = $(DESTDIR)/boot + +XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y + include buildconfigs/mk.linux-2.6-xen diff --git a/buildconfigs/mk.linux-2.6-paravirt b/buildconfigs/mk.linux-2.6-paravirt index 1a0127733e..4ff8d7b99b 100644 --- a/buildconfigs/mk.linux-2.6-paravirt +++ b/buildconfigs/mk.linux-2.6-paravirt @@ -6,6 +6,8 @@ LINUX_VER ?= 2.6-paravirt XEN_TARGET_ARCH = x86_32 IMAGE_TARGET ?= vmlinux bzImage +XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y + EXTRAVERSION ?= include buildconfigs/mk.linux-2.6-xen diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index afd56b1397..a0e4fa89f1 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -27,6 +27,15 @@ include buildconfigs/src.$(XEN_LINUX_SOURCE) # The real action starts here! .PHONY: build build: $(LINUX_DIR)/include/linux/autoconf.h +ifneq ($(XEN_LINUX_ALLOW_INTERFACE_MISMATCH),y) + @if ! diff -urN -x '*.size' $(LINUX_SRCDIR)/include/xen/interface xen/include/public ; then \ + echo "" 1>&2 ; \ + echo " *** $(LINUX_SRCDIR)/include/xen/interface is out of date " 1>&2 ; \ + echo " *** relative to $(XEN_ROOT)/xen/include/public." 1>&2 ; \ + echo "" 1>&2 ; \ + exit 1 ; \ + fi +endif if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) modules ; \ $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ diff --git a/buildconfigs/mk.linux-2.6.5-SLES-xen b/buildconfigs/mk.linux-2.6.5-SLES-xen index 693e89ca64..c3733ee55b 100644 --- a/buildconfigs/mk.linux-2.6.5-SLES-xen +++ b/buildconfigs/mk.linux-2.6.5-SLES-xen @@ -2,6 +2,8 @@ XEN_TARGET_ARCH = x86_32 XEN_TARGET_X86_PAE = y +XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y + EXTRAVERSION = -xen LINUX_VER = 2.6.5-SLES diff --git a/buildconfigs/mk.linux-2.6.9-RHEL-xen b/buildconfigs/mk.linux-2.6.9-RHEL-xen index 9b1a9b87a7..3f6717fe3b 100644 --- a/buildconfigs/mk.linux-2.6.9-RHEL-xen +++ b/buildconfigs/mk.linux-2.6.9-RHEL-xen @@ -2,6 +2,8 @@ XEN_TARGET_ARCH = x86_32 XEN_TARGET_X86_PAE = y +XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y + EXTRAVERSION = -xen LINUX_VER = 2.6.9-RHEL |