rpms/kernel/FC-5 kernel-2.6.spec,1.2081,1.2082

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7339

Modified Files:
	kernel-2.6.spec 
Log Message:
* Wed Mar 27 2006 Dave Jones <davej at redhat.com>
- Enable SMP alternatives for x86/x86-64
- Temporarily disable Xen.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2081
retrieving revision 1.2082
diff -u -r1.2081 -r1.2082
--- kernel-2.6.spec	29 Mar 2006 05:52:39 -0000	1.2081
+++ kernel-2.6.spec	29 Mar 2006 17:03:34 -0000	1.2082
@@ -6,7 +6,7 @@
 %define buildup 1
 %define buildsmp 1
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -766,7 +766,7 @@
 # Fix broken x86-64 32bit vDSO
 %patch208 -p1
 # SMP alternatives
-#%patch209 -p1
+%patch209 -p1
 
 #
 # ppc64
@@ -1247,7 +1247,7 @@
       ln -sf ../../../include/asm-ppc* asm
       popd
     fi
-%if %{buildxen}
+%if %{includexen}
     cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %endif
 
@@ -1318,6 +1318,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot
 
+%if %{includexen}
 %if %{buildxen}
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
@@ -1332,6 +1333,7 @@
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
 %endif
+%endif
 
 cd linux-%{kversion}.%{_target_cpu}
 
@@ -1343,6 +1345,7 @@
 BuildKernel %make_target %kernel_image smp
 %endif
 
+%if %{includexen}
 %if %{buildxenPAE}
 BuildKernel vmlinuz vmlinuz xen0-PAE
 BuildKernel vmlinuz vmlinuz xenU-PAE
@@ -1352,6 +1355,7 @@
 BuildKernel vmlinuz vmlinuz xen0
 BuildKernel vmlinuz vmlinuz xenU
 %endif
+%endif
 
 %if %{buildkdump}
 BuildKernel %make_target %kernel_image kdump
@@ -1365,6 +1369,7 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
+%if %{includexen}
 %if %{buildxen}
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
@@ -1378,6 +1383,7 @@
 EOF
 chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 %endif
+%endif
 
 %if %{builddoc}
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation
@@ -1568,6 +1574,7 @@
 /usr/src/kernels/%{KVERREL}smp-%{_target_cpu}
 %endif
 
+%if %{includexen}
 %if %{buildxen}
 %files xen0
 %defattr(-,root,root)
@@ -1647,6 +1654,7 @@
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu}
 %endif
+%endif
 
 %if %{buildkdump}
 
@@ -1679,6 +1687,10 @@
 %endif
 
 %changelog
+* Wed Mar 27 2006 Dave Jones <davej at redhat.com>
+- Enable SMP alternatives for x86/x86-64
+- Temporarily disable Xen.
+
 * Tue Mar 26 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2080_FC5]
 - 2.6.16.1