rpms/kernel/devel kernel-2.6.spec,1.3193,1.3194
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Wed May 30 21:09:04 UTC 2007
- Previous message (by thread): rpms/perl-Pod-Simple/devel .cvsignore, 1.4, 1.5 perl-Pod-Simple.spec, 1.10, 1.11 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Module-CoreList/devel .cvsignore, 1.12, 1.13 perl-Module-CoreList.spec, 1.15, 1.16 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27742
Modified Files:
kernel-2.6.spec
Log Message:
Make things behave better if with_debug=0 and don't build -debug bits for baseonly, smponly and xenonly cases
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3193
retrieving revision 1.3194
diff -u -r1.3193 -r1.3194
--- kernel-2.6.spec 29 May 2007 16:10:35 -0000 1.3193
+++ kernel-2.6.spec 30 May 2007 21:08:25 -0000 1.3194
@@ -83,6 +83,7 @@
%define with_xen 0
%define with_kdump 0
%define with_debug 0
+%define debugbuildsenabled 0
%endif
# if requested, only build smp kernel
@@ -92,6 +93,7 @@
%define with_xen 0
%define with_kdump 0
%define with_debug 0
+%define debugbuildsenabled 0
%endif
# if requested, only build xen kernel
@@ -101,6 +103,7 @@
%define with_pae 0
%define with_kdump 0
%define with_debug 0
+%define debugbuildsenabled 0
%endif
# don't build xen or kdump kernels for OLPC
@@ -601,6 +604,7 @@
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.
Group: System Environment/Kernel
@@ -643,6 +647,7 @@
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
%endif
+%endif
%package doc
@@ -670,7 +675,8 @@
glibc package.
-%if %{?debugbuildsenabled}
+%if %{debugbuildsenabled}
+%if %{with_debug}
%package debug
Summary: The Linux kernel compiled with extra debugging enabled.
Group: System Environment/Kernel
@@ -713,6 +719,7 @@
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
%endif
+%endif
%package xen
@@ -1119,8 +1126,7 @@
rm -f kernel-%{kversion}-*xen*.config
%endif
-%if 0%{?debugbuildsenabled}
-%else
+%if ! %{debugbuildsenabled}
rm -f kernel-%{kversion}-*-debug.config
%endif
@@ -1423,11 +1429,11 @@
%if %{debugbuildsenabled}
%if %{with_debug}
BuildKernel %make_target %kernel_image debug
-%endif
%if %{with_pae}
BuildKernel %make_target %kernel_image PAE-debug
%endif
%endif
+%endif
%if %{with_pae}
BuildKernel %make_target %kernel_image PAE
@@ -1610,6 +1616,7 @@
%if %{debugbuildsenabled}
+%if %{with_debug}
%post debug
/sbin/new-kernel-pkg --package kernel-debug --mkinitrd --depmod --install %{KVERREL}debug || exit $?
if [ -x /sbin/weak-modules ]
@@ -1649,6 +1656,7 @@
popd > /dev/null
fi
%endif
+%endif
%post xen
if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then
@@ -1729,6 +1737,7 @@
#fi
%if %{debugbuildsenabled}
+%if %{with_debug}
%preun debug
/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}debug || exit $?
if [ -x /sbin/weak-modules ]
@@ -1743,6 +1752,7 @@
# /sbin/weak-modules --remove-kernel %{KVERREL}PAE || exit $?
#fi
%endif
+%endif
%preun xen
/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen || exit $?
- Previous message (by thread): rpms/perl-Pod-Simple/devel .cvsignore, 1.4, 1.5 perl-Pod-Simple.spec, 1.10, 1.11 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Module-CoreList/devel .cvsignore, 1.12, 1.13 perl-Module-CoreList.spec, 1.15, 1.16 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list