[Xen-changelog] [xen-unstable] Build updates for building upstream trees.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1184837160 -3600
# Node ID 0eaa9f605b92e7d418633641f4ae3faebd6f1647
# Parent  e1f74a5a09cbb52ed67bb8b089c4cd2d31cc4a73
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@xxxxxxxxxxxxx>
---
 .hgignore                      |    7 ++-----
 buildconfigs/enable-xen-config |    4 ++++
 buildconfigs/mk.linux-2.6      |   14 ++++++++++++++
 buildconfigs/mk.linux-2.6-git  |    2 ++
 buildconfigs/mk.linux-2.6-mm   |   14 +-------------
 buildconfigs/mk.linux-2.6-rc   |   14 +-------------
 buildconfigs/mk.linux-2.6-tip  |   14 +-------------
 7 files changed, 25 insertions(+), 44 deletions(-)

diff -r e1f74a5a09cb -r 0eaa9f605b92 .hgignore
--- a/.hgignore Wed Jul 18 13:56:21 2007 +0100
+++ b/.hgignore Thu Jul 19 10:26:00 2007 +0100
@@ -62,14 +62,11 @@
 ^extras/mini-os/h/xen-public$
 ^extras/mini-os/mini-os.*$
 ^install/.*$
-^linux-[^/]*-native/.*$
-^linux-[^/]*-xen/.*$
-^linux-[^/]*-xen0/.*$
-^linux-[^/]*-xenU/.*$
 ^linux-[^/]*-paravirt/.*$
-^linux-[^/]*-mm/.*$
+^linux-2.6[^/]*/.*$
 ^linux-[^/]*-rc/.*$
 ^linux-[^/]*-tip/.*$
+^linux-[^/]*-git/.*$
 ^linux-[^/]*\.patch$
 ^mkddbxen$
 ^netbsd-[^/]*-tools/.*$
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/enable-xen-config
--- a/buildconfigs/enable-xen-config    Wed Jul 18 13:56:21 2007 +0100
+++ b/buildconfigs/enable-xen-config    Thu Jul 19 10:26:00 2007 +0100
@@ -28,9 +28,13 @@ setopt CONFIG_PARAVIRT y
 setopt CONFIG_PARAVIRT y
 setopt CONFIG_XEN y
 setopt CONFIG_VMI y
+setopt CONFIG_KVM y
+setopt CONFIG_KVM_INTEL y
+setopt CONFIG_KVM_AMD y
 setopt CONFIG_LGUEST n
 setopt CONFIG_XEN_BLKDEV_FRONTEND y
 setopt CONFIG_XEN_NETDEV_FRONTEND y
 setopt CONFIG_HVC_XEN y
+setopt CONFIG_NUMA n
 
 exit 0
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/mk.linux-2.6
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/buildconfigs/mk.linux-2.6 Thu Jul 19 10:26:00 2007 +0100
@@ -0,0 +1,14 @@
+XEN_LINUX_SOURCE ?= tarball
+LINUX_VER ?= 2.6
+
+XEN_LINUX_TARBALL_KETCHUP := y
+
+IMAGE_TARGET ?= vmlinux bzImage
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
+XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
+
+EXTRAVERSION ?=
+
+include buildconfigs/mk.linux-2.6-xen
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/mk.linux-2.6-git
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/buildconfigs/mk.linux-2.6-git     Thu Jul 19 10:26:00 2007 +0100
@@ -0,0 +1,2 @@
+LINUX_VER ?= 2.6-git
+include buildconfigs/mk.linux-2.6
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/mk.linux-2.6-mm
--- a/buildconfigs/mk.linux-2.6-mm      Wed Jul 18 13:56:21 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-mm      Thu Jul 19 10:26:00 2007 +0100
@@ -1,14 +1,2 @@ XEN_LINUX_SOURCE ?= tarball
-XEN_LINUX_SOURCE ?= tarball
 LINUX_VER ?= 2.6-mm
-
-XEN_LINUX_TARBALL_KETCHUP := y
-
-IMAGE_TARGET ?= vmlinux bzImage
-
-XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
-
-XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
-
-EXTRAVERSION ?=
-
-include buildconfigs/mk.linux-2.6-xen
+include buildconfigs/mk.linux-2.6
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/mk.linux-2.6-rc
--- a/buildconfigs/mk.linux-2.6-rc      Wed Jul 18 13:56:21 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-rc      Thu Jul 19 10:26:00 2007 +0100
@@ -1,14 +1,2 @@ XEN_LINUX_SOURCE ?= tarball
-XEN_LINUX_SOURCE ?= tarball
 LINUX_VER ?= 2.6-rc
-
-XEN_LINUX_TARBALL_KETCHUP := y
-
-IMAGE_TARGET ?= vmlinux bzImage
-
-XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
-
-XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
-
-EXTRAVERSION ?=
-
-include buildconfigs/mk.linux-2.6-xen
+include buildconfigs/mk.linux-2.6
diff -r e1f74a5a09cb -r 0eaa9f605b92 buildconfigs/mk.linux-2.6-tip
--- a/buildconfigs/mk.linux-2.6-tip     Wed Jul 18 13:56:21 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-tip     Thu Jul 19 10:26:00 2007 +0100
@@ -1,14 +1,2 @@ XEN_LINUX_SOURCE ?= tarball
-XEN_LINUX_SOURCE ?= tarball
 LINUX_VER ?= 2.6-tip
-
-XEN_LINUX_TARBALL_KETCHUP := y
-
-IMAGE_TARGET ?= vmlinux bzImage
-
-XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
-
-XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
-
-EXTRAVERSION ?=
-
-include buildconfigs/mk.linux-2.6-xen
+include buildconfigs/mk.linux-2.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog