rpms/kernel/devel Makefile,1.37,1.38 kernel-2.6.spec,1.2895,1.2896
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Dec 30 03:53:00 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1953
Modified Files:
Makefile kernel-2.6.spec
Log Message:
More -debug infrastructure work.
Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile 19 Dec 2006 02:25:12 -0000 1.37
+++ Makefile 30 Dec 2006 03:52:58 -0000 1.38
@@ -31,7 +31,7 @@
@perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y' configs/config-nodebug
@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y' configs/config-nodebug
- @perl -pi -e 's/^%define builddebug 1/%define builddebug 0/' kernel-2.6.spec
+ @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel-2.6.spec
@perl -pi -e 's/^#%patch1020 -p1/%patch1020 -p1/' kernel-2.6.spec
release:
@@ -49,7 +49,7 @@
@perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' configs/config-nodebug
@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' configs/config-nodebug
- @perl -pi -e 's/^%define builddebug 0/%define builddebug 1/' kernel-2.6.spec
+ @perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel-2.6.spec
@perl -pi -e 's/^%patch1020 -p1/#%patch1020 -p1/' kernel-2.6.spec
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2895
retrieving revision 1.2896
diff -u -r1.2895 -r1.2896
--- kernel-2.6.spec 30 Dec 2006 03:33:59 -0000 1.2895
+++ kernel-2.6.spec 30 Dec 2006 03:52:58 -0000 1.2896
@@ -1,21 +1,26 @@
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.
-
+# These defines get overriden below. Don't bother changing them.
%define buildup 1
-# Only used on archs without run-time support (ie ppc, sparc64)
%define buildsmp 0
%define buildpae 0
+%define builddebug 0
+%define signmodules 0
+%define builddoc 0
+%define buildkdump 0
+%define buildheaders 1
+
# Whether to apply the Xen patches, leave this enabled.
%define includexen 0
# Whether to build the Xen kernels, disable if you want.
%define buildxen 0
-%define builddoc 0
-%define buildkdump 0
-%define buildheaders 1
-%define builddebug 0
+# Set debugbuildsenabled to 1 for production (build separate debug kernels)
+# and 0 for rawhide (all kernels are debug kernels).
+# See also 'make debug' and 'make release'.
+%define debugbuildsenabled 0
+
+# Temporary, will go away soon when fixed.
%define gpgsignedmodulesarentbroken 0
# Versions of various parts
@@ -29,8 +34,6 @@
%define rpmversion 2.6.%{sublevel}
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
-%define signmodules 0
-
%define make_target bzImage
%define kernel_image x86
@@ -89,11 +92,13 @@
%ifarch i686
%define buildpae 1
+%define builddebug 1
# we build always xen HV with pae
%define xen_flags verbose=y crash_debug=y pae=y
%endif
%ifarch x86_64
+%define builddebug 1
%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
%define image_install_path boot
%define signmodules 1
@@ -515,6 +520,7 @@
You'll want to install this package if you need a reference to the
options that can be passed to Linux kernel modules at load time.
+
%package headers
Summary: Header files for the Linux kernel for use by glibc
Group: Development/System
@@ -528,6 +534,30 @@
building most standard programs and are also needed for rebuilding the
glibc package.
+
+%package debug
+Summary: The Linux kernel compiled with extra debugging enabled.
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-drm = 4.3.0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-debug
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+AutoReq: no
+AutoProv: yes
+
+%description debug
+The kernel package contains the Linux kernel (vmlinuz), the core of any
+Linux operating system. The kernel handles the basic functions
+of the operating system: memory allocation, process allocation, device
+input and output, etc.
+
+This variant of the kernel has numerous debugging options enabled.
+It should only be installed when trying to gather additional information
+on kernel bugs, as some of these options impact performance noticably.
+
+
%package PAE
Summary: The Linux kernel compiled for PAE capable machines.
@@ -564,6 +594,28 @@
This package provides kernel headers and makefiles sufficient to build modules
against the PAE kernel package.
+%package PAE-debug
+Summary: The Linux kernel compiled with extra debugging enabled for PAE capable machines.
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-drm = 4.3.0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-PAE-debug
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+AutoReq: no
+AutoProv: yes
+
+%description PAE-debug
+This package includes a version of the Linux kernel with support for up to
+64GB of high memory. It requires a CPU with Physical Address Extensions (PAE).
+The non-PAE kernel can only address up to 4GB of memory.
+Install the kernel-PAE package if your machine has more than 4GB of memory.
+
+This variant of the kernel has numerous debugging options enabled.
+It should only be installed when trying to gather additional information
+on kernel bugs, as some of these options impact performance noticably.
+
%package smp
Summary: The Linux kernel compiled for SMP machines.
@@ -1020,7 +1072,7 @@
rm -f kernel-%{kversion}-*kdump*.config
%endif
-%if 0%{?builddebug}
+%if 0%{?debugbuildsenabled}
rm -f kernel-%kversion}-*-debug.config
%endif
@@ -1306,6 +1358,10 @@
BuildKernel %make_target %kernel_image smp
%endif
+%if %{builddebug}
+BuildKernel %make_target %kernel_image debug
+%endif
+
%if %{includexen}
%if %{buildxen}
BuildKernel %xen_target %xen_image xen
More information about the fedora-cvs-commits
mailing list