From da88b5cdc0446cecc9e0a297bf28500d04fd2c41 Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Thu, 29 Jun 2006 06:30:46 +0000 Subject: [PATCH] - enable PAE by default on archs supporting it Changed files: xen.spec -> 1.29 --- xen.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen.spec b/xen.spec index 88a8240..c749d34 100644 --- a/xen.spec +++ b/xen.spec @@ -3,7 +3,7 @@ # - script for rc-boot # # Conditional build: -%bcond_with pae # build PAE (HIGHMEM64G) support (SMP kernels use it by default) +%bcond_without pae # build without PAE (HIGHMEM64G) support (PLD Xen* kernels require PAE) # Summary: Xen - a virtual machine monitor Summary(pl): Xen - monitor maszyny wirtualnej @@ -46,6 +46,12 @@ Obsoletes: xen-doc ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%ifnarch i686 athlon pentium3 pentium4 +%define with_pae 0 +%endif + + + %description This package contains the Xen hypervisor and Xen tools, needed to run virtual machines on x86 systems, together with the kernel-xen* @@ -107,17 +113,17 @@ chmod -R u+w . CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \ CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" \ %{__make} xen tools docs \ + %{?with_pae:XEN_TARGET_X86_PAE=y} \ CC="%{__cc}" \ - CXX="%{__cxx}" \ - %{?with_pae:XEN_TARGET_X86_PAE=y} + CXX="%{__cxx}" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/run/{xen-hotplug,xend,xenstored} %{__make} install-xen install-tools install-docs \ - DESTDIR=$RPM_BUILD_ROOT \ %{?with_pae:XEN_TARGET_X86_PAE=y} \ + DESTDIR=$RPM_BUILD_ROOT \ XEN_PYTHON_NATIVE_INSTALL=1 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -- 2.44.0