rpms/kernel/devel kernel.spec,1.215,1.216

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9240

Modified Files:
	kernel.spec 
Log Message:
* Fri Oct 12 2007 Jarod Wilson <jwilson at redhat.com>
- Fix virtual kernel-arch Provides for flavored kernels (bz #327961)
- Add paeonly build flag



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- kernel.spec	11 Oct 2007 17:18:58 -0000	1.215
+++ kernel.spec	12 Oct 2007 13:37:20 -0000	1.216
@@ -87,6 +87,8 @@
 %define with_baseonly  %{?_with_baseonly:     1} %{?!_with_baseonly:     0}
 # Only build the smp kernel (--with smponly):
 %define with_smponly   %{?_with_smponly:      1} %{?!_with_smponly:      0}
+# Only build the pae kernel (--with paeonly):
+%define with_paeonly   %{?_with_paeonly:      1} %{?!_with_paeonly:      0}
 # Only build the xen kernel (--with xenonly):
 %define with_xenonly   %{?_with_xenonly:      1} %{?!_with_xenonly:      0}
 
@@ -193,6 +195,15 @@
 %define with_debug 0
 %endif
 
+# if requested, only build pae kernel
+%if %{with_paeonly}
+%define with_up 0
+%define with_smp 0
+%define with_xen 0
+%define with_kdump 0
+%define with_debug 0
+%endif
+
 # if requested, only build xen kernel
 %if %{with_xenonly}
 %define with_up 0
@@ -416,7 +427,7 @@
 #
 %define kernel_reqprovconf \
 Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1}\
 Provides: kernel-drm = 4.3.0\
 Provides: kernel-drm-nouveau = 10\
 Requires(pre): %{kernel_prereq}\
@@ -856,6 +867,13 @@
 %endif
 %endif
 
+%if %{with_paeonly}
+%if !%{with_pae}
+echo "Cannot build --with paeonly, pae build is disabled"
+exit 1
+%endif
+%endif
+
 %if %{with_xenonly}
 %if !%{with_xen}
 echo "Cannot build --with xenonly, xen build is disabled"
@@ -1217,10 +1235,11 @@
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
+
 ApplyPatch linux-2.6-firewire-lockdep.patch
 ApplyPatch linux-2.6-e100-race.patch
 
-# ---------- below all scheduled for 2.6.23 -----------------
+# ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
 
@@ -1813,6 +1832,10 @@
 
 
 %changelog
+* Fri Oct 12 2007 Jarod Wilson <jwilson at redhat.com>
+- Fix virtual kernel-arch Provides for flavored kernels (bz #327961)
+- Add paeonly build flag
+
 * Thu Oct 11 2007 Dave Jones <davej at redhat.com>
 - Fix race in e100 driver.