Attachment 158446 Details for Bug 240878 – Add --with/without debuginfo flag and some other flag cleanups

[patch] Add --with/without debuginfo flag and some other flag cleanups

kernel-f7.spec.diff (text/plain), 8.39 KB, created by Jarod Wilson on 2007-07-03 14:10:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jarod Wilson

Created: 2007-07-03 14:10:51 UTC

Size: 8.39 KB

patch

obsolete

>Index: kernel-2.6.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
>retrieving revision 1.3245
>diff -u -p -r1.3245 kernel-2.6.spec
>--- kernel-2.6.spec	3 Jul 2007 07:11:45 -0000	1.3245
>+++ kernel-2.6.spec	3 Jul 2007 13:59:09 -0000
>@@ -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)
>@@ -11,30 +10,32 @@ Summary: The Linux kernel (the core of t
> # to 0 in here to disable them.
> #
> # standard kernel
>-%define with_up      %{?_without_up:      0} %{?!_without_up:      1}
>+%define with_up        %{?_without_up:        0} %{?!_without_up:        1}
> # kernel-smp (only valid for ppc 32-bit, sparc64)
>-%define with_smp     %{?_without_smp:     0} %{?!_without_smp:     1}
>+%define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
> # kernel-PAE (only valid for i686)
>-%define with_pae     %{?_without_pae:     0} %{?!_without_pae:     1}
>+%define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
> # kernel-xen
>-%define with_xen     %{?_without_xen:     0} %{?!_without_xen:     1}
>+%define with_xen       %{?_without_xen:       0} %{?!_without_xen:       1}
> # kernel-kdump
>-%define with_kdump   %{?_without_kdump:   0} %{?!_without_kdump:   1}
>+%define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
> # kernel-debug
>-%define with_debug   %{?_without_debug:   0} %{!?_without_debug:   1}
>+%define with_debug     %{?_without_debug:     0} %{!?_without_debug:     1}
> # kernel-doc
>-%define with_doc     %{?_without_doc:     0} %{?!_without_doc:     1}
>+%define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
> # kernel-headers
>-%define with_headers %{?_without_headers: 0} %{?!_without_headers: 1}
>+%define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
>+# kernel-debuginfo
>+%define with_debuginfo %{?_without_debuginfo: 0} %{!?_without_debuginfo: 1}
> 
> # Additional options for user-friendly one-off kernel building:
> #
> # Only build the base kernel (--with baseonly):
>-%define with_baseonly %{?_with_baseonly: 1} %{?!_with_baseonly: 0}
>+%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}
>+%define with_smponly   %{?_with_smponly:      1} %{?!_with_smponly:      0}
> # Only build the xen kernel (--with xenonly):
>-%define with_xenonly  %{?_with_xenonly:  1} %{?!_with_xenonly:  0}
>+%define with_xenonly   %{?_with_xenonly:      1} %{?!_with_xenonly:      0}
> 
> # Whether or not to gpg sign modules
> %define with_modsign 1
>@@ -76,6 +77,14 @@ Summary: The Linux kernel (the core of t
> %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
> %define hdrarch %_target_cpu
> 
>+%if !%{debugbuildsenabled}
>+%define  with_debug 0
>+%endif
>+
>+%if !%{with_debuginfo}
>+%define _enable_debug_packages 0
>+%endif
>+
> # if requested, only build base kernel
> %if %{with_baseonly}
> %define with_smp 0
>@@ -271,6 +280,7 @@ Summary: The Linux kernel (the core of t
> %define with_pae 0
> %define with_xen 0
> %define with_kdump 0
>+%define with_debuginfo 0
> %define _enable_debug_packages 0
> %endif
> 
>@@ -823,7 +833,7 @@ Prereq: /usr/bin/find
> 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.
> Group: System Environment/Kernel
>@@ -893,7 +903,7 @@ building most standard programs and are 
> glibc package.
> 
> 
>-%if %{?debugbuildsenabled}
>+%if %{with_debug}
> %package debug
> Summary: The Linux kernel compiled with extra debugging enabled.
> Group: System Environment/Kernel
>@@ -1279,7 +1289,7 @@ mv drivers/xen/blktap/blktap.c drivers/x
> %patch1013 -p1
> %patch1015 -p1
> # Only spew extra warnings on rawhide builds.
>-%if ! %{debugbuildsenabled}
>+%if !%{with_debug}
> %patch1016 -p1
> %endif
> %patch1019 -p1
>@@ -1520,7 +1530,7 @@ rm -f kernel-%{kversion}-*xen*.config
> rm -f kernel-%{kversion}-*kdump*.config
> %endif
> 
>-%if 0%{?debugbuildsenabled}
>+%if %{with_debug}
> %else
> rm -f kernel-%{kversion}-*-debug.config
> %endif
>@@ -1620,7 +1630,7 @@ BuildKernel() {
> 
>     # Start installing the results
> 
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
>     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot
>     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/%{image_install_path}
> %endif
>@@ -1718,7 +1728,7 @@ BuildKernel() {
>     #
>     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
>     #
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
>     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
>     cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
> %endif
>@@ -1819,14 +1829,12 @@ mkdir -p $RPM_BUILD_ROOT/boot
> 
> cd linux-%{kversion}.%{_target_cpu}
> 
>-%if %{debugbuildsenabled}
> %if %{with_debug}
> BuildKernel %make_target %kernel_image debug
> %endif
> %if %{with_pae}
> BuildKernel %make_target %kernel_image PAE-debug
> %endif
>-%endif
> 
> %if %{with_pae}
> BuildKernel %make_target %kernel_image PAE
>@@ -1857,15 +1865,15 @@ BuildKernel %make_target %kernel_image k
> # This macro is used by %%install, so we must redefine it before that.
> %define debug_package %{nil}
> 
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %global __debug_package 1
> %files debuginfo-common
> %defattr(-,root,root)
>-/usr/src/debug/%{name}-%{version}/linux-%{kversion}.%{_target_cpu}
>+/usr/src/debug/kernel-%{version}/linux-%{kversion}.%{_target_cpu}
> %if %{includexen}
> %if %{with_xen}
>-/usr/src/debug/%{name}-%{version}/xen
>+/usr/src/debug/kernel-%{version}/xen
> %endif
> %endif
> %dir /usr/src/debug
>@@ -2008,7 +2016,7 @@ if [ "$HARDLINK" != "no" -a -x /usr/sbin
> fi
> 
> 
>-%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 ]
>@@ -2127,7 +2135,7 @@ fi
> #    /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 $?
> if [ -x /sbin/weak-modules ]
>@@ -2159,7 +2167,7 @@ fi
> %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
> 
> %if %{with_up}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files debuginfo
> %defattr(-,root,root)
>@@ -2202,9 +2210,8 @@ fi
> %endif
> 
> 
>-%if %{debugbuildsenabled}
> %if %{with_debug}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files debug-debuginfo
> %defattr(-,root,root)
>@@ -2239,12 +2246,11 @@ fi
> %verify(not mtime) /usr/src/kernels/%{KVERREL}-debug-%{_target_cpu}
> /usr/src/kernels/%{KVERREL}debug-%{_target_cpu}
> %endif
>-%endif
> 
> 
> 
> %if %{with_pae}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files PAE-debuginfo
> %defattr(-,root,root)
>@@ -2279,9 +2285,8 @@ fi
> %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"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files PAE-debug-debuginfo
> %defattr(-,root,root)
>@@ -2316,13 +2321,12 @@ fi
> %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu}
> /usr/src/kernels/%{KVERREL}PAE-debug-%{_target_cpu}
> %endif
>-%endif
> # PAE
> %endif
> 
> 
> %if %{with_smp}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files smp-debuginfo
> %defattr(-,root,root)
>@@ -2361,7 +2365,7 @@ fi
> 
> %if %{includexen}
> %if %{with_xen}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files xen-debuginfo
> %defattr(-,root,root)
>@@ -2403,7 +2407,7 @@ fi
> %endif
> 
> %if %{with_kdump}
>-%if "%{_enable_debug_packages}" == "1"
>+%if %{with_debuginfo}
> %ifnarch noarch
> %files kdump-debuginfo
> %defattr(-,root,root)
>@@ -2450,6 +2454,9 @@ fi
> %endif
> 
> %changelog
>+* Tue Jul 03 2007 Jarod Wilson <jwilson@redhat.com>
>+- Add --with/without debuginfo build flag
>+
> * Tue Jul 03 2007 Dave Jones <davej@redhat.com>
> - Drop warning about OSS usage. The API will probably never die.
>

Actions: View | Diff

Attachments on bug 240878: 158446