Commit Graph
268 Commits
Author SHA1 Message Date
Keir Fraser 8dedf64313 buildconfigs: update enable-xen-config
Enable a bunch of new Xen options, primarily blktap, PCI passthrough
and platform PCI device (PVHVM).

Also set default for a bunch of non-Xen options which are not covered
by the defconfig.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2010-08-24 16:14:14 +01:00
Keir Fraser c69440a3d7 linux buildconfig: Fix quoting error
Prevent shell syntax error if $(XEN_LINUX_CONFIG) is empty.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
2010-08-13 08:46:45 +01:00
Keir Fraser 1af8775400 Switch default Linux kernel build to 2.6.32
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
2010-06-18 14:06:38 +01:00
Keir Fraser 6fa52bad26 buildconfig: Set CONFIG_TUN=y in Linux kernel config
This is needed by the pv_ops kernel in order to support HVM guests
with emulated VIFs

Signed-off-by: Alex Zeffertt <alex.zeffertt@eu.citrix.com>
2010-06-15 11:37:59 +01:00
Keir Fraser b39bfe9930 buildconfig: Fix setopt in case where option is already set but to the wrong value
Signed-off-by: Alex Zeffertt <alex.zeffertt@eu.citrix.com>
2010-06-15 11:37:24 +01:00
Keir Fraser 96e4190045 Honour XEN_LINUX_GIT_LOCALBRANCH and XEN_LINUX_GITREV variables
XEN_GIT_ORIGIN to set the name of the remote origin; the default is
still "xen".

XEN_LINUX_GIT_LOCALBRANCH allows the name of the local branch to be
set.  The default is the same as the remote branch.

XEN_LINUX_GITREV allows a specific GIT revision to be checked out,
rather than a branch.  By default it is the remote branch name.

This change should result in no change in behaviour in the normal
case.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
2010-05-12 08:43:47 +01:00
Keir Fraser b857d5d8d1 pv_ops: Switch kernel from xen/master to xen/stable-2.6.31.x
This is functionally identical to xen/master at the moment, but more
meaningful.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
2010-05-04 12:17:19 +01:00
Keir Fraser 2096682555 Make sure git clone gets the right kernel branch
When cloning kernel repo:
  1. make remote called "xen" rather than the default "origin"
  2. directly checkout the desired branch, rather than the default
  then the desired one

Git 1.5 doesn't support -b on git clone, and seems to do something odd
with the checkout branch argument, so avoid using the newer
commandline options.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
2010-05-04 12:16:37 +01:00
Keir Fraser 35e9666fc4 Revert 21110:d791173ca65b and 21111:986d3b1d30fb
Break automated tests.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2010-04-07 15:44:29 +01:00
Keir Fraser 8aa77c0ef1 Update git clone command
When cloning the kernel repo:
   1. make remote called "xen" rather than the default "origin"
   2. directly checkout the desired branch in one step

Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>
2010-04-07 08:14:34 +01:00
Keir Fraser 715dd40aed Switch default kernel branch to xen/stable-2.6.31.x
This is functionally identical to xen/master at the moment, but more
meaningful.

Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>
2010-04-07 08:13:20 +01:00
Keir Fraser 9266eb0ef8 Obtain Linux kernel via git protocol by default (GIT_HTTP=y overrides)
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2009-10-20 14:36:01 +01:00
Keir Fraser a09edd4427 Obtain Linux kernels via git-over-http
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2009-10-08 09:24:32 +01:00
Keir Fraser b69f59f63e pv_ops: Build xen/master branch rather than xen-tip/master 2009-09-22 08:02:50 +01:00
Keir Fraser 89a647853f Enable some SCSI drivers in pvops kernel config
Enables a couple of SCSI host controllers which are found in our test
farm but not enabled in the default upstream kernel.  The new drivers
are compiled as modules which is pretty harmless so this should be
safe.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2009-09-02 16:12:41 +01:00
Keir Fraser 53fd4502a1 xm-test: Disable DEBUG_STACK_USAGE which breaks test cases
The unnecessary 'used greatest stack depth' messages on the console
breaks xm-test cases by random.  Typically a testcase reads input from
the console and parses it.  When DEBUG_STACK_USAGE is enabled, these
stack usage messages are printed by random - the test case reads this
message, cannot handle it and fails.

Signed-off-by: Andreas Florath <xen@flonatel.org>
2009-08-05 13:39:37 +01:00
Keir Fraser 3bdedbcbc0 Compile the kernel by default with bridge support
This one-liner adds bridge support to the Linux kernel
(CONFIG_BRIDGE=y).  It is a precondition for some xm-tests that
bridge is enabled.  Also IMHO it makes sense to configure a dom0 with
bridge capabilities.

Signed-off-by: Andreas Florath <xen@flonatel.org>
2009-08-02 12:25:01 +01:00
Keir Fraser 1ed13664e3 Remove support for out-of-date SLES9 and RHEL4 kernel
ports  from build integration

Both distros now include Xen support from their respective upstreams
and these kernels are very out of date wrt both the upstream distro
kernel and the upstream Xen kernel.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2009-07-20 15:51:14 +01:00
Keir Fraser e88a10e8c7 buildconfigs/src.git-clone: use git clone, avoid git remote
git 1.4.x (which is on even some moderately recent systems) doesn't
have the `git remote' command.  This is what caused the most recent
patchman build failure.

The machinery in buildconfigs/src.git-clone was rather more
complicated than needed, too.  In this patch I replace this with a
similar set of runes to those used for ioemu-remote (almost identical
except that the QEMU_TAG feature is not supported in this instance).

I have done a successful test build with this change.

Cc: Ian Campbell <Ian.Campbell@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2009-06-18 15:32:48 +01:00
Keir Fraser 662b95dadd x86: Switch to using pvops kernel by default for Linux
Keave ia64 on 2.6.18 since it currently has no dom0 support in pvops

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2009-06-16 11:15:48 +01:00
Keir Fraser 80ff70bc1c Update XEN_LINUX_GIT_REMOTEBRANCH to match changes made in upstream
repo. Needed if you want setting KERNELS=linux-2.6-pvops in
config/Linux.mk to work.

Signed-off-by: Alex Zeffert <alex.zeffert@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2009-04-27 18:59:56 +01:00
Keir Fraser 405523d06b Add missing pv_ops Linux buildconfig file. 2009-02-17 11:20:18 +00:00
Keir Fraser 701b5e7696 BUILD: Add option to build the Xen pvops git tree.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2009-02-17 11:11:17 +00:00
Keir Fraser bef2c17dbc Do not print `***' when compiling unless we fall over
This has finally bugged me enough to do something about it:

make prints `***' when it stops due to an error.  With make -j, and/or
with automated build systems, this error marker can be in the middle
of a large logfile.  It is useful to be able to search for it.

Therefore change occurrences of `*' to `=' for information and warning
messages.  `***' is reserved for cases where the build stops.

A corresponding change is being applied to qemu-xen-unstable.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2009-01-12 10:17:12 +00:00
Keir Fraser cbd07b72a3 Download external tarballs from xenbits.xensource.com
I have copied the tarballs that the xen-unstable build downloads to
xenbits.xensource.com (which also hosts our hg and git).  This patch
changes the download URLs to use that location.

That way the build will depend on only one external machine, under one
administration, rather than many.  Also it means that the build won't
break if these sites become permanently unavailable or are rearranged
and we don't run a risk of having to panic and beg if a file should go
missing.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2009-01-05 11:19:16 +00:00
Keir Fraser c22f6e2d2f Allow to specify Linux kernel config file
The env variable XEN_LINUX_CONFIG is used to specify this
file.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
2008-10-09 10:05:41 +01:00
Keir Fraser 041f09c60d [BUILD] Support cloning Linux tree from a git repository.
Integrate the linux-2.6-tip tree as linux-2.6-tip-latest

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2008-07-03 10:45:46 +01:00
Keir Fraser f0f278e1da When building from a tarball release use hardcoded path to
linux-2.6.18-xen.hg as a last resort when searching for a Linux source
tree.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2008-06-09 10:44:09 +01:00
Keir Fraser 84d54d5d8b i386: Remove non-PAE hypervisor build target.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2008-05-08 14:32:11 +01:00
Keir Fraser 03dc7c2feb [BUILD] Disable LOCALVERSION_AUTO in upstream Linux builds.
If this option is enabled then the Xen mercurial version ID gets
tacked onto the kernel version (e.g. 2.6.24-git22-hg2593b69b183b)
which is unlikely to be useful or desirable. All the trees which we
build using this method already have uniquely identifying versions
(e.g. 2.6.24-git22 or 2.6.24-mm1).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2008-02-12 14:59:22 +00:00
Keir Fraser 3eae93972b [BUILD] Fixup support for building upstream kernels.
In particular:
 - support merged x86 architecture. To facilitate this it made sense
   to encode some existing logic in shell scripts rather than
   increasing complicated make conditionals.
 - set CONFIG_PARAVIRT_GUEST=y which is required for newer kernels.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2008-02-12 14:59:01 +00:00
Keir Fraser b650bde790 [BUILD] Add option to ensure kernel build is non-interactive.
This is useful for the non 2.6.18-xen builds where the defconfig at
any particular momement may require additional questions to be
answered.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
2008-02-12 14:57:36 +00:00
Keir Fraser 53f48ca221 Fix some build system error handling.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2007-12-20 13:16:21 +00:00
Keir Fraser 58319a4983 linux: Force build failure if modules build fails
When building a linux kernel, if the modules build fails, then
the build carries on regardless.

The problem is simple - the "make modules" failure is not seen
by the calling make since its return value is not what is
returned.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2007-12-20 10:44:06 +00:00
Ian Campbell 414614d84e Refactor buildconfigs/mk.* to make the common rules separate from the
-xen specific configuration.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-30 16:02:33 +00:00
Ian Campbell 8cfd4e0e16 ALLOW_INTERFACE_MISMATCH defaults to "y" so don't specify it
everywhere.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-30 16:01:07 +00:00
Ian Campbell fe875c5098 Always use ketchup for tarball sources, since the only non-user was
the paravirt tree.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-30 16:01:07 +00:00
Ian Campbell e368009768 Remove the linux-2.6-paravirt build target since it is obsolete now the code is
upstream.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-30 16:01:07 +00:00
Keir Fraser 3f943baffc Revert 16065:671dcd08e806 and try again to fix the issue.
Changing LINUX_VER causes us to clone the wrong repository so instead
use the kernel's "kernelrelease" target to figure out the correct
Linux version.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-04 14:21:11 +01:00
Keir Fraser 53dbebc03b Fix kernel version after linux-2.6.18-xen.hg 219:3e8752eb69dc which
applied 2.6.18.8,

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-10-04 10:03:04 +01:00
kfraser@localhost.localdomain e3157936d4 ia64: Fix target for Linux image install.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
2007-09-19 15:20:56 +01:00
Ian Campbell 71f7e668f0 Using "make install" causes a distro specific script
(/sbin/installkernel) to be called since linux-2.6.18-xen.hg
211:c1f5d027adf7.

Unfortunately on some distros this script is broken for non-root
use. Our needs are pretty simple anyway so just open code the
installation of the kernel.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-09-19 12:12:49 +01:00
Ian Campbell 47e2355fc9 silentoldconfig seems to break automated testing, try an explicit make prepare
instead.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-08-17 16:34:11 +01:00
Ian Campbell d6ad276628 Linux 2.6.18 doesn't create include/linux/autoconf.h as a side effect
of make oldconfig. Use silentoldconfig instead.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-08-17 13:30:05 +01:00
Ian Campbell bc39e90242 Pull XEN_LINUX_UPDATE into mk.linux-2.6-xen so it can be shared by
src.tarball and src.hg-clone

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-08-17 13:28:53 +01:00
Ian Campbell 2aaae75a0f 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>
2007-07-19 10:26:00 +01:00
Ian Campbell 9f426c8ad5 Add support for building -mm, -tip and -rc upstream trees.
(note that not all of those contains Xen support just yet and that a
native kernel will be silently built in that case.)


Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-07-09 12:04:20 +01:00
Ian Campbell b02f230733 Add support to the tarball source type for using the ketchup tool.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-07-09 11:57:07 +01:00
Ian Campbell 97e8f14b87 Add hooks for a script to update kernel configuration after tree has been
prepared. This is to support upstream sources which do not enable Xen in their
default configurations.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-07-09 11:29:39 +01:00
Ian Campbell 2141bdd107 Remove .hgskip. This was an ancient mercurial patch which was never
taken upstream.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-07-09 11:29:30 +01:00