rpms/kernel/F-11 kernel.spec,1.1813,1.1814

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16440

Modified Files:
	kernel.spec 
Log Message:
* Sun Feb 07 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-29.rc2
- Fix i686 builds (we only want PAE & PAEdebug, not i686-debug...)
- Using this kernel is *NOT* recommended yet. Still needs DRM to be
  sorted out.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -p -r1.1813 -r1.1814
--- kernel.spec	7 Feb 2010 22:07:57 -0000	1.1813
+++ kernel.spec	7 Feb 2010 23:16:33 -0000	1.1814
@@ -1689,9 +1689,12 @@ mkdir -p $RPM_BUILD_ROOT/boot
 
 cd linux-%{kversion}.%{_target_cpu}
 
+%if %{with_up}
 %if %{with_debug}
 BuildKernel %make_target %kernel_image debug
 %endif
+BuildKernel %make_target %kernel_image
+%endif
 
 %if %{with_pae_debug}
 BuildKernel %make_target %kernel_image PAEdebug
@@ -1701,10 +1704,6 @@ BuildKernel %make_target %kernel_image P
 BuildKernel %make_target %kernel_image PAE
 %endif
 
-%if %{with_up}
-BuildKernel %make_target %kernel_image
-%endif
-
 %if %{with_smp}
 BuildKernel %make_target %kernel_image smp
 %endif
@@ -2046,6 +2045,11 @@ fi
 # and build.
 
 %changelog
+* Sun Feb 07 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-29.rc2
+- Fix i686 builds (we only want PAE & PAEdebug, not i686-debug...)
+- Using this kernel is *NOT* recommended yet. Still needs DRM to be
+  sorted out.
+
 * Sun Feb 07 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-28.rc2 
 - xfs: xfs_swap_extents needs to handle dynamic fork offsets (rhbz#510823)
   from sandeen.