rpms/kernel/FC-6 kernel-2.6.spec,1.2881,1.2882

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
more -debug tweaks


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2881
retrieving revision 1.2882
diff -u -r1.2881 -r1.2882
--- kernel-2.6.spec	31 Dec 2006 02:25:38 -0000	1.2881
+++ kernel-2.6.spec	31 Dec 2006 19:31:41 -0000	1.2882
@@ -586,7 +586,6 @@
 
 %package PAE
 Summary: The Linux kernel compiled for PAE capable machines.
-
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -644,7 +643,6 @@
 
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
-
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -683,7 +681,6 @@
 
 %package xen
 Summary: The Linux kernel compiled for Xen VM operations
-
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
@@ -716,7 +713,6 @@
 
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
-
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1385,20 +1381,23 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
-%if %{buildup}
-BuildKernel %make_target %kernel_image
+%if %{builddebug}
+BuildKernel %make_target %kernel_image debug
 %endif
 
 %if %{buildpae}
 BuildKernel %make_target %kernel_image PAE
+%if %{builddebug}
+BuildKernel %make_target %kernel_image PAE-debug
+%endif
 %endif
 
-%if %{buildsmp}
-BuildKernel %make_target %kernel_image smp
+%if %{buildup}
+BuildKernel %make_target %kernel_image
 %endif
 
-%if %{builddebug}
-BuildKernel %make_target %kernel_image debug
+%if %{buildsmp}
+BuildKernel %make_target %kernel_image smp
 %endif
 
 %if %{includexen}
@@ -1623,6 +1622,14 @@
   popd > /dev/null
 fi
 
+%post debug
+/sbin/new-kernel-pkg --package kernel-debug --mkinitrd --depmod --install %{KVERREL}debug || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL}debug || exit $?
+fi
+
+
 %preun
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} || exit $?
 if [ -x /sbin/weak-modules ]
@@ -1651,6 +1658,13 @@
     /sbin/weak-modules --remove-kernel %{KVERREL}kdump || exit $?
 fi
 
+%preun debug
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}debug || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL}debug || exit $?
+fi
+
 %preun xen
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen || exit $?
 if [ -x /sbin/weak-modules ]
@@ -1713,6 +1727,7 @@
 /usr/include/*
 %endif
 
+%if %{builddebug}
 %files debug
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}debug
@@ -1727,6 +1742,7 @@
 /lib/modules/%{KVERREL}debug/updates
 /lib/modules/%{KVERREL}debug/weak-updates
 %ghost /boot/initrd-%{KVERREL}debug.img
+%endif
 
 %if %{buildpae}
 %if "%{_enable_debug_packages}" == "1"
@@ -1768,8 +1784,8 @@
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu}
-%endif
 
+%if %{builddebug}
 %files PAE-debug
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE-debug
@@ -1784,7 +1800,8 @@
 /lib/modules/%{KVERREL}PAE-debug/updates
 /lib/modules/%{KVERREL}PAE-debug/weak-updates
 %ghost /boot/initrd-%{KVERREL}PAE-debug.img
-
+%endif
+%endif
 
 %if %{buildsmp}
 %if "%{_enable_debug_packages}" == "1"