rpms/kernel/devel kernel-2.6.spec,1.3244,1.3245

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Simplify debug kernel condition checks


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3244
retrieving revision 1.3245
diff -u -r1.3244 -r1.3245
--- kernel-2.6.spec	2 Jul 2007 16:13:09 -0000	1.3244
+++ kernel-2.6.spec	2 Jul 2007 17:07:41 -0000	1.3245
@@ -1,6 +1,5 @@
 Summary: The Linux kernel (the core of the Linux operating system)
 
-
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
 # All should default to 1 (enabled) and be flipped to 0 (disabled)
@@ -55,6 +54,10 @@
 # See also 'make debug' and 'make release'.
 %define debugbuildsenabled 0
 
+%if ! %{debugbuildsenabled}
+%define with_debug 0
+%endif
+
 # Versions of various parts
 
 # Polite request for people who spin their own kernel rpms:
@@ -86,6 +89,7 @@
 
 %if %{nopatches}
 %define includexen 0
+%define with_xen 0
 %define variant -vanilla
 %else
 %define variant_fedora -fedora
@@ -627,7 +631,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the PAE kernel package.
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %package PAE-debug
 Summary: The Linux kernel compiled with extra debugging enabled for PAE capable machines.
@@ -671,7 +674,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 %endif
-%endif
 
 
 %package doc
@@ -699,7 +701,6 @@
 glibc package.
 
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %package debug
 Summary: The Linux kernel compiled with extra debugging enabled.
@@ -743,7 +744,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 %endif
-%endif
 
 
 %package xen
@@ -1146,7 +1146,7 @@
 rm -f kernel-%{kversion}-*xen*.config
 %endif
 
-%if ! %{debugbuildsenabled}
+%if ! %{with_debug}
 rm -f kernel-%{kversion}-*-debug.config
 %endif
 
@@ -1432,14 +1432,12 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 BuildKernel %make_target %kernel_image debug
 %if %{with_pae}
 BuildKernel %make_target %kernel_image PAE-debug
 %endif
 %endif
-%endif
 
 %if %{with_pae}
 BuildKernel %make_target %kernel_image PAE
@@ -1621,7 +1619,6 @@
 fi
 
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %post debug
 /sbin/new-kernel-pkg --package kernel-debug --mkinitrd --depmod --install %{KVERREL}debug || exit $?
@@ -1662,7 +1659,6 @@
   popd > /dev/null
 fi
 %endif
-%endif
 
 %post xen
 if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then
@@ -1742,7 +1738,6 @@
 #    /sbin/weak-modules --remove-kernel %{KVERREL}kdump || exit $?
 #fi
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %preun debug
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}debug || exit $?
@@ -1758,7 +1753,6 @@
 #    /sbin/weak-modules --remove-kernel %{KVERREL}PAE || exit $?
 #fi
 %endif
-%endif
 
 %preun xen
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen || exit $?
@@ -1819,7 +1813,6 @@
 %endif
 
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %if "%{_enable_debug_packages}" == "1"
 %ifnarch noarch
@@ -1831,7 +1824,6 @@
 /usr/lib/debug/lib/modules/%{KVERREL}debug
 /usr/lib/debug/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu}
 %endif
-%endif
 
 %files debug
 %defattr(-,root,root)
@@ -1896,7 +1888,6 @@
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu}
 
-%if %{debugbuildsenabled}
 %if %{with_debug}
 %if "%{_enable_debug_packages}" == "1"
 %ifnarch noarch
@@ -1908,7 +1899,6 @@
 /usr/lib/debug/lib/modules/%{KVERREL}PAE-debug
 /usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu}
 %endif
-%endif
 
 %files PAE-debug
 %defattr(-,root,root)