Commit Graph
230 Commits
Author SHA1 Message Date
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
Keir Fraser 9ba645fd7d By default allow differences between Xen and XenLinux public headers.
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-06-27 21:28:19 +01:00
kfraser@localhost.localdomain 599054e792 Allow make targets to be called via make -C
Change PWD to CURDIR in new mk.linux-2.6-xen to allow make targets to
be called via a make -C

From: Ben Guthro <bguthro@virtualiron.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-06-13 11:05:47 +01:00
Ian Campbell f1356ca4e0 [PATCH] Check for non-existent local repo
Check for non-existent local clone in select-repository.
Also change the #!/bin/bash to #!/bin/sh since the Makefile is calling
it explicitly with sh, and fix a couple other typos.

Signed-off-by: Aron Griffis <aron@hp.com>
2007-06-05 15:52:46 +01:00
Ian Campbell fbc9cef80b BUILD: Clone the Linux tree if it wasn't found via $(LINUX_SRC_PATH)
even if it happens to be a local directory.

If we located the Linux tree by deriving the path from "hg path
default" and it is a local path then prepend "file://" to prevent us
trying to symlink it.

Unfortunately mercurial doesn't understand file:// URLs so we have to
strip it off again before calling hg clone.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-06-05 08:57:53 +01:00
Ian Campbell 7fe901b954 If we find a Linux repository in $(LINUX_SRC_PATH) then symlink it
instead of cloning it. This enables developers to keep a linux tree
separate to their xen repository and to make changes there which are
picked up by the Xen build.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-06-04 15:41:32 +01:00
Ian Campbell 7c8c43eb65 Remove $(LINUX_SRCDIR) on distclean.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-06-04 11:37:50 +01:00
Ian Campbell c58e445d1c Remove sparse tree.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-06-04 11:16:19 +01:00
Ian Campbell d18c70c482 Switch over to separate Linux tree.
The sparse tree is now deprecated and will deleted in due course. The
xen-unstable build system will automatically clone the correct Linux
tree for you and all the old makefile targets
(dist/linux-2.6-xen{,0,U}/etc) should continue to work.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-06-04 10:14:53 +01:00
Ian Campbell a7cc66ccfc Updates for XEN_LINUX_SOURCE=hg-clone.
By default search for mercurial repositories in $(LINUX_SRC_PATH)
followed by a location derived from the current Xen repository's
default parent. e.g. A clone of
http://xenbits.xensource.com/xen-unstable.hg will derive
http://xenbits.xensource.com/linux-2.6.18-xen.hg. A specific
repository can be specified by giving XEN_LINUX_HGREPO=<URL or path>
on the make command line.

Add capability to put XEN_LINUX_UPDATE=y on the make command line to
update the Linux repository. Disabled by default since we don't want
to touch a developers repository without permission.

Dropped XEN_LINUX_HGUPDATES since it was unecessary and confusing.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-05-31 14:51:09 +01:00
Ian Campbell d3f7f10c42 Make header mismatch checking more robust against build time changes in
xen/include/public/foreign.

Unfortunately diff's -x and -X options do not support excluding paths just
individual files so we have to list unqualified filenames. This is ok for now
since there are no filename clashes.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-05-30 17:37:58 +01:00
Ian Campbell 0055a08a1a 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>
2007-05-30 13:10:20 +01:00
Ian Campbell 7a35a3f0b5 Factor out sparse tree makefile fragments and introduce hg-clone and
tarball methods in preparation for migrating away from the sparse tree
layout.

This re-introduces 14883:6568c1882af5 and 14862:98efd2e410ae plus
further fixes.

Also add makefile fragments to support building the paravirt ops tree
(make linux-2.6-paravirt-build).

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-05-25 11:03:40 +01:00
Alex Williamson 0accb29430 [IA64] Switch to CONFIG_IA64_GENERIC config and wire in Xen machine vector
This enables the switch to the generic flavor ia64 kernel for the -xen
and -xen0 kernels.  -xenU is changed to a CONFIG_IA64_XEN build.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
2007-05-07 08:54:56 -06:00
kfraser@localhost.localdomain d1672c6b39 Revert 14883:6568c1882af5 and 14862:98efd2e410ae.
This reverts the preparation for removing the sparse tree, since these
modified scripts are not yet ready:
 1. XENGUEST suffix was lost yet depended on still by sparse tree
 Makefiles (hacked around by 14883; also reverted).
 2. XEN_TARGET_X86_PAE default value seems to be ignored
 (out-of-the-box 'make dist' will build non-PAE kernels).

Signed-off-by: Keir Fraser <keir@xensource.com>
2007-04-20 17:51:10 +01:00
kfraser@localhost.localdomain 2fe0ea05b4 Allow use of foo.local buildconfig overrides.
From: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-04-17 13:22:24 +01:00
Ian Campbell 2124081013 Factor out sparse tree makefile fragments and introduce an alternative hg-clone
method in preparation for migrating away from the sparse tree layout.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-04-16 17:38:37 +01:00
Ian Campbell f4f4172c69 Update defconfigs for new XEN_COMPAT_300004 option.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2007-03-13 10:02:45 +00:00
kfraser@localhost.localdomain 16ea519d6c linux: Upgrade to latest Xen interface version (0x00030205).
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-03-09 11:44:31 +00:00
awilliam@xenbuild2.aw a6e547a237 merge with xen-unstable.hg 2007-02-04 12:24:53 -07:00
kaf24@firebug.cl.cam.ac.uk 47fd2b1be1 Fix xen-x86_32 defconfig to includean option needed for PAE builds.
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-02-01 17:52:08 +00:00
awilliam@xenbuild2.aw 8e36c6490c merge with xen-unstable.hg 2007-01-31 10:30:54 -07:00
kaf24@localhost.localdomain 00baa47b02 linux: Build TPM backend as a module by default.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
2007-01-30 13:37:43 +00:00
awilliam@xenbuild2.aw 530aa67db7 [IA64] Update buildconfigs
Mainly just taking defaults from make oldconfig.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
2007-01-29 11:17:15 -07:00
Steven Hand ce5ae920dd Re-enable CONFIG_HOTPLUG_CPU by deafult for -xen? kernels.
Signed-off-by: Steven Hand <steven@xensource.com>
2007-01-22 13:38:04 +00:00
Christian Limpach c6a0a466fa [merge] with xen-unstable
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-19 14:48:57 +00:00
Christian Limpach 1a9914c007 [linux networking] Remove the code to allocate page sized skbs.
This is no longer used much since the default is to always copy packets
to guests.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-18 18:40:30 +00:00
kfraser@localhost.localdomain fe747edd26 Copy vmlinuz to correct folder when make source on IA64 platform.
Signed-off-by: Yongkang You <yongkang.you@intel.com>
2007-01-18 18:19:52 +00:00
Christian Limpach 361f8004cb [merge] with xen-unstable 2007-01-18 15:18:07 +00:00
Christian Limpach 54a1273470 [linux] Update to linux-2.6.18.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>


--HG--
rename : linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_pre.h => linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch.h
rename : patches/linux-2.6.17/blktap-aio-16_03_06.patch => patches/linux-2.6.18/blktap-aio-16_03_06.patch
rename : patches/linux-2.6.17/fix-ide-cd-pio-mode.patch => patches/linux-2.6.18/fix-ide-cd-pio-mode.patch
rename : patches/linux-2.6.17/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch => patches/linux-2.6.18/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch
rename : patches/linux-2.6.17/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch => patches/linux-2.6.18/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch
rename : patches/linux-2.6.17/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch => patches/linux-2.6.18/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch
rename : patches/linux-2.6.17/i386-mach-io-check-nmi.patch => patches/linux-2.6.18/i386-mach-io-check-nmi.patch
rename : patches/linux-2.6.17/ipv6-no-autoconf.patch => patches/linux-2.6.18/ipv6-no-autoconf.patch
rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
rename : patches/linux-2.6.17/net-csum.patch => patches/linux-2.6.18/net-csum.patch
rename : patches/linux-2.6.17/net-gso-5-rcv-mss.patch => patches/linux-2.6.18/net-gso-5-rcv-mss.patch
rename : patches/linux-2.6.17/net-gso-6-linear-segmentation.patch => patches/linux-2.6.18/net-gso-6-linear-segmentation.patch
rename : patches/linux-2.6.17/pmd-shared.patch => patches/linux-2.6.18/pmd-shared.patch
rename : patches/linux-2.6.17/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch => patches/linux-2.6.18/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
rename : patches/linux-2.6.17/series => patches/linux-2.6.18/series
rename : patches/linux-2.6.17/x86-elfnote-as-preprocessor-macro.patch => patches/linux-2.6.18/x86-elfnote-as-preprocessor-macro.patch
rename : patches/linux-2.6.17/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch
rename : patches/linux-2.6.17/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch
rename : patches/linux-2.6.17/xen-hotplug.patch => patches/linux-2.6.18/xen-hotplug.patch
rename : patches/linux-2.6.17/xenoprof-generic.patch => patches/linux-2.6.18/xenoprof-generic.patch
2007-01-17 18:41:22 +00:00
Christian Limpach ccace2b704 [linux config] enable CONFIG_SCSI_SATA_AHCI/CONFIG_BNX2 in dom0 config.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-18 16:21:08 +00:00
Christian Limpach 7ccf58133f [linux config] enable CONFIG_SCSI_SATA_AHCI in dom0 config.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-18 15:34:29 +00:00
Steven Hand 29bbe50b23 Fix clean build after cset 13345:648e58e31c26
Signed-off-by: Steven Hand <steven@xensource.com>
2007-01-15 10:53:06 +00:00
Christian Limpach 432e7b62cb [linux] Update to linux-2.6.17.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

--HG--
rename : patches/linux-2.6.16.33/blktap-aio-16_03_06.patch => patches/linux-2.6.17/blktap-aio-16_03_06.patch
rename : patches/linux-2.6.16.33/fix-hz-suspend.patch => patches/linux-2.6.17/fix-hz-suspend.patch
rename : patches/linux-2.6.16.33/fix-ide-cd-pio-mode.patch => patches/linux-2.6.17/fix-ide-cd-pio-mode.patch
rename : patches/linux-2.6.16.33/git-2a8a3d5b65e86ec1dfef7d268c64a909eab94af7.patch => patches/linux-2.6.17/git-2a8a3d5b65e86ec1dfef7d268c64a909eab94af7.patch
rename : patches/linux-2.6.16.33/git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch => patches/linux-2.6.17/git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch
rename : patches/linux-2.6.16.33/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch => patches/linux-2.6.17/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch
rename : patches/linux-2.6.16.33/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch => patches/linux-2.6.17/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch
rename : patches/linux-2.6.16.33/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch => patches/linux-2.6.17/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch
rename : patches/linux-2.6.16.33/i386-mach-io-check-nmi.patch => patches/linux-2.6.17/i386-mach-io-check-nmi.patch
rename : patches/linux-2.6.16.33/ipv6-no-autoconf.patch => patches/linux-2.6.17/ipv6-no-autoconf.patch
rename : patches/linux-2.6.16.33/kasprintf.patch => patches/linux-2.6.17/kasprintf.patch
rename : patches/linux-2.6.16.33/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch => patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
rename : patches/linux-2.6.16.33/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch => patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
rename : patches/linux-2.6.16.33/net-csum.patch => patches/linux-2.6.17/net-csum.patch
rename : patches/linux-2.6.16.33/net-gso-0-base.patch => patches/linux-2.6.17/net-gso-0-base.patch
rename : patches/linux-2.6.16.33/net-gso-1-check-dodgy.patch => patches/linux-2.6.17/net-gso-1-check-dodgy.patch
rename : patches/linux-2.6.16.33/net-gso-2-checksum-fix.patch => patches/linux-2.6.17/net-gso-2-checksum-fix.patch
rename : patches/linux-2.6.16.33/net-gso-3-fix-errorcheck.patch => patches/linux-2.6.17/net-gso-3-fix-errorcheck.patch
rename : patches/linux-2.6.16.33/net-gso-4-kill-warnon.patch => patches/linux-2.6.17/net-gso-4-kill-warnon.patch
rename : patches/linux-2.6.16.33/net-gso-5-rcv-mss.patch => patches/linux-2.6.17/net-gso-5-rcv-mss.patch
rename : patches/linux-2.6.16.33/net-gso-6-linear-segmentation.patch => patches/linux-2.6.17/net-gso-6-linear-segmentation.patch
rename : patches/linux-2.6.16.33/pmd-shared.patch => patches/linux-2.6.17/pmd-shared.patch
rename : patches/linux-2.6.16.33/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch => patches/linux-2.6.17/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
rename : patches/linux-2.6.16.33/series => patches/linux-2.6.17/series
rename : patches/linux-2.6.16.33/vsnprintf.patch => patches/linux-2.6.17/vsnprintf.patch
rename : patches/linux-2.6.16.33/x86-elfnote-as-preprocessor-macro.patch => patches/linux-2.6.17/x86-elfnote-as-preprocessor-macro.patch
rename : patches/linux-2.6.16.33/x86-increase-interrupt-vector-range.patch => patches/linux-2.6.17/x86-increase-interrupt-vector-range.patch
rename : patches/linux-2.6.16.33/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.17/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch
rename : patches/linux-2.6.16.33/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.17/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch
rename : patches/linux-2.6.16.33/xen-hotplug.patch => patches/linux-2.6.17/xen-hotplug.patch
rename : patches/linux-2.6.16.33/xenoprof-generic.patch => patches/linux-2.6.17/xenoprof-generic.patch
2007-01-12 14:30:49 +00:00
Christian Limpach 58a6d83e7d [linux build] Append $XENGUEST to kernel version.
This was lost in changeset 13286:c89384734c19.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-08 17:38:47 +00:00
Christian Limpach 1c86aafefb [linux build] Build Linux kernels with output files in a separate directory.
Use a single source tree (linux-2.6-xen) and use Linux' O= option to
make the build put output files in a
build-linux-$(LINUX_VER)-$(EXTRAVERSION)_$(XEN_TARGET_ARCH) directory,
making it possible to build both x86_32 and x86_64 kernels in the same
tree.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
2007-01-08 11:33:45 +00:00
kfraser@localhost.localdomain 00f75a257f Add XEN_FRAMEBUFFER to -xen defconfigs.
Signed-off-by: Atsushi SAKAI <sakaia@jp.fujitsu.com>
2006-12-04 09:21:10 +00:00
Ian Campbell c4c2ab2a5f Update -xen0 defconfig for nhew kexec option
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
2006-11-30 14:05:27 +00:00
Ian Campbell 6fc8621b96 [XEN] Kexec / Kdump: x86_64 specific code
This patch contains the x86_64 implementation of Kexec / Kdump for Xen.

Signed-Off-By: Magnus Damm <magnus@valinux.co.jp>
Signed-Off-By: Simon Horman <horms@verge.net.au>
2006-11-30 12:38:51 +00:00