ia64/xen-unstable

changeset 15620:0eaa9f605b92

Build updates for building upstream trees.

* Merge the guts of the various upstream branch buildconfigs into a
single mk.linux-2.6 which they include.
* Add support for the -git snapshot branch.
* Update .hgignore to ignore all these new trees.
* Update buildconfigs/enable-xen-config to make the upstream defconfig
compile without questions.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Thu Jul 19 10:26:00 2007 +0100 (2007-07-19)
parents e1f74a5a09cb
children f191aa8ac8ea
files .hgignore buildconfigs/enable-xen-config buildconfigs/mk.linux-2.6 buildconfigs/mk.linux-2.6-git buildconfigs/mk.linux-2.6-mm buildconfigs/mk.linux-2.6-rc buildconfigs/mk.linux-2.6-tip
line diff
     1.1 --- a/.hgignore	Wed Jul 18 13:56:21 2007 +0100
     1.2 +++ b/.hgignore	Thu Jul 19 10:26:00 2007 +0100
     1.3 @@ -62,14 +62,11 @@
     1.4  ^extras/mini-os/h/xen-public$
     1.5  ^extras/mini-os/mini-os.*$
     1.6  ^install/.*$
     1.7 -^linux-[^/]*-native/.*$
     1.8 -^linux-[^/]*-xen/.*$
     1.9 -^linux-[^/]*-xen0/.*$
    1.10 -^linux-[^/]*-xenU/.*$
    1.11  ^linux-[^/]*-paravirt/.*$
    1.12 -^linux-[^/]*-mm/.*$
    1.13 +^linux-2.6[^/]*/.*$
    1.14  ^linux-[^/]*-rc/.*$
    1.15  ^linux-[^/]*-tip/.*$
    1.16 +^linux-[^/]*-git/.*$
    1.17  ^linux-[^/]*\.patch$
    1.18  ^mkddbxen$
    1.19  ^netbsd-[^/]*-tools/.*$
     2.1 --- a/buildconfigs/enable-xen-config	Wed Jul 18 13:56:21 2007 +0100
     2.2 +++ b/buildconfigs/enable-xen-config	Thu Jul 19 10:26:00 2007 +0100
     2.3 @@ -28,9 +28,13 @@ setopt()
     2.4  setopt CONFIG_PARAVIRT y
     2.5  setopt CONFIG_XEN y
     2.6  setopt CONFIG_VMI y
     2.7 +setopt CONFIG_KVM y
     2.8 +setopt CONFIG_KVM_INTEL y
     2.9 +setopt CONFIG_KVM_AMD y
    2.10  setopt CONFIG_LGUEST n
    2.11  setopt CONFIG_XEN_BLKDEV_FRONTEND y
    2.12  setopt CONFIG_XEN_NETDEV_FRONTEND y
    2.13  setopt CONFIG_HVC_XEN y
    2.14 +setopt CONFIG_NUMA n
    2.15  
    2.16  exit 0
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6	Thu Jul 19 10:26:00 2007 +0100
     3.3 @@ -0,0 +1,14 @@
     3.4 +XEN_LINUX_SOURCE ?= tarball
     3.5 +LINUX_VER ?= 2.6
     3.6 +
     3.7 +XEN_LINUX_TARBALL_KETCHUP := y
     3.8 +
     3.9 +IMAGE_TARGET ?= vmlinux bzImage
    3.10 +
    3.11 +XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
    3.12 +
    3.13 +XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
    3.14 +
    3.15 +EXTRAVERSION ?=
    3.16 +
    3.17 +include buildconfigs/mk.linux-2.6-xen
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-git	Thu Jul 19 10:26:00 2007 +0100
     4.3 @@ -0,0 +1,2 @@
     4.4 +LINUX_VER ?= 2.6-git
     4.5 +include buildconfigs/mk.linux-2.6
     5.1 --- a/buildconfigs/mk.linux-2.6-mm	Wed Jul 18 13:56:21 2007 +0100
     5.2 +++ b/buildconfigs/mk.linux-2.6-mm	Thu Jul 19 10:26:00 2007 +0100
     5.3 @@ -1,14 +1,2 @@
     5.4 -XEN_LINUX_SOURCE ?= tarball
     5.5  LINUX_VER ?= 2.6-mm
     5.6 -
     5.7 -XEN_LINUX_TARBALL_KETCHUP := y
     5.8 -
     5.9 -IMAGE_TARGET ?= vmlinux bzImage
    5.10 -
    5.11 -XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
    5.12 -
    5.13 -XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
    5.14 -
    5.15 -EXTRAVERSION ?=
    5.16 -
    5.17 -include buildconfigs/mk.linux-2.6-xen
    5.18 +include buildconfigs/mk.linux-2.6
     6.1 --- a/buildconfigs/mk.linux-2.6-rc	Wed Jul 18 13:56:21 2007 +0100
     6.2 +++ b/buildconfigs/mk.linux-2.6-rc	Thu Jul 19 10:26:00 2007 +0100
     6.3 @@ -1,14 +1,2 @@
     6.4 -XEN_LINUX_SOURCE ?= tarball
     6.5  LINUX_VER ?= 2.6-rc
     6.6 -
     6.7 -XEN_LINUX_TARBALL_KETCHUP := y
     6.8 -
     6.9 -IMAGE_TARGET ?= vmlinux bzImage
    6.10 -
    6.11 -XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
    6.12 -
    6.13 -XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
    6.14 -
    6.15 -EXTRAVERSION ?=
    6.16 -
    6.17 -include buildconfigs/mk.linux-2.6-xen
    6.18 +include buildconfigs/mk.linux-2.6
     7.1 --- a/buildconfigs/mk.linux-2.6-tip	Wed Jul 18 13:56:21 2007 +0100
     7.2 +++ b/buildconfigs/mk.linux-2.6-tip	Thu Jul 19 10:26:00 2007 +0100
     7.3 @@ -1,14 +1,2 @@
     7.4 -XEN_LINUX_SOURCE ?= tarball
     7.5  LINUX_VER ?= 2.6-tip
     7.6 -
     7.7 -XEN_LINUX_TARBALL_KETCHUP := y
     7.8 -
     7.9 -IMAGE_TARGET ?= vmlinux bzImage
    7.10 -
    7.11 -XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
    7.12 -
    7.13 -XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
    7.14 -
    7.15 -EXTRAVERSION ?=
    7.16 -
    7.17 -include buildconfigs/mk.linux-2.6-xen
    7.18 +include buildconfigs/mk.linux-2.6