From 2aaae75a0fa0c6668847c8f8e4c2b46749bde081 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 19 Jul 2007 10:26:00 +0100 Subject: 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 --- 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 +------------- 6 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 buildconfigs/mk.linux-2.6 create mode 100644 buildconfigs/mk.linux-2.6-git (limited to 'buildconfigs') diff --git a/buildconfigs/enable-xen-config b/buildconfigs/enable-xen-config index b427a12d90..1f9945faef 100644 --- a/buildconfigs/enable-xen-config +++ b/buildconfigs/enable-xen-config @@ -28,9 +28,13 @@ setopt() 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 --git a/buildconfigs/mk.linux-2.6 b/buildconfigs/mk.linux-2.6 new file mode 100644 index 0000000000..07794c8211 --- /dev/null +++ b/buildconfigs/mk.linux-2.6 @@ -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 --git a/buildconfigs/mk.linux-2.6-git b/buildconfigs/mk.linux-2.6-git new file mode 100644 index 0000000000..1a142dd809 --- /dev/null +++ b/buildconfigs/mk.linux-2.6-git @@ -0,0 +1,2 @@ +LINUX_VER ?= 2.6-git +include buildconfigs/mk.linux-2.6 diff --git a/buildconfigs/mk.linux-2.6-mm b/buildconfigs/mk.linux-2.6-mm index 9007c10b03..f02e864c09 100644 --- a/buildconfigs/mk.linux-2.6-mm +++ b/buildconfigs/mk.linux-2.6-mm @@ -1,14 +1,2 @@ -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 --git a/buildconfigs/mk.linux-2.6-rc b/buildconfigs/mk.linux-2.6-rc index 58c19b862c..34f45134e7 100644 --- a/buildconfigs/mk.linux-2.6-rc +++ b/buildconfigs/mk.linux-2.6-rc @@ -1,14 +1,2 @@ -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 --git a/buildconfigs/mk.linux-2.6-tip b/buildconfigs/mk.linux-2.6-tip index 6f9cac1170..0588ad24af 100644 --- a/buildconfigs/mk.linux-2.6-tip +++ b/buildconfigs/mk.linux-2.6-tip @@ -1,14 +1,2 @@ -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 -- cgit v1.2.3