diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 14:59:01 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 14:59:01 +0000 |
| commit | 3eae93972b9e0b74e3060603d29eebec7d89d14a (patch) | |
| tree | 2b12334583c5203f37d793cb7f9b0152864025d8 /buildconfigs/enable-xen-config | |
| parent | b650bde790d6e2c918de3d2ce3b2a89d56b25896 (diff) | |
| download | xen-3eae93972b9e0b74e3060603d29eebec7d89d14a.tar.gz xen-3eae93972b9e0b74e3060603d29eebec7d89d14a.tar.bz2 xen-3eae93972b9e0b74e3060603d29eebec7d89d14a.zip | |
[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>
Diffstat (limited to 'buildconfigs/enable-xen-config')
| -rw-r--r-- | buildconfigs/enable-xen-config | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/buildconfigs/enable-xen-config b/buildconfigs/enable-xen-config index 1f9945faef..1d40aca3e5 100644 --- a/buildconfigs/enable-xen-config +++ b/buildconfigs/enable-xen-config @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -e if [ $# -ne 1 ] ; then echo "Usage $(basename $0) <config-file>" 1>&2 @@ -26,6 +26,7 @@ setopt() } setopt CONFIG_PARAVIRT y +setopt CONFIG_PARAVIRT_GUEST y setopt CONFIG_XEN y setopt CONFIG_VMI y setopt CONFIG_KVM y @@ -37,4 +38,10 @@ setopt CONFIG_XEN_NETDEV_FRONTEND y setopt CONFIG_HVC_XEN y setopt CONFIG_NUMA n +case ${XEN_TARGET_ARCH} in + x86_32) setopt CONFIG_64BIT n ;; + x86_64) setopt CONFIG_64BIT y ;; + *) ;; +esac + exit 0 |