rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Add missing --with/--without pae build flag support

Browse Source 
Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson 2011-01-07 16:54:23 -05:00
parent 5b65297cef
commit 5b032757ea
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel.spec
View File

@ -103,6 +103,8 @@ Summary: The Linux 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) # kernel-smp (only valid for ppc 32-bit)
%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}
# kernel-debug # kernel-debug
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} %define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
# kernel-doc # kernel-doc
@ -140,6 +142,8 @@ Summary: The Linux kernel
%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): # 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 pae kernel (--with paeonly):
%define with_paeonly %{?_with_paeonly: 1} %{?!_with_paeonly: 0}
# Only build the debug kernel (--with dbgonly): # Only build the debug kernel (--with dbgonly):
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0} %define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
@ -221,21 +225,28 @@ Summary: The Linux kernel
%define debuginfodir /usr/lib/debug %define debuginfodir /usr/lib/debug
# kernel-PAE is only built on i686. # kernel-PAE is only built on i686.
%ifarch i686 %ifnarch i686
%define with_pae 1
%else
%define with_pae 0 %define with_pae 0
%endif %endif
# if requested, only build base kernel # if requested, only build base kernel
%if %{with_baseonly} %if %{with_baseonly}
%define with_smp 0 %define with_smp 0
%define with_pae 0
%define with_debug 0 %define with_debug 0
%endif %endif
# if requested, only build smp kernel # if requested, only build smp kernel
%if %{with_smponly} %if %{with_smponly}
%define with_up 0 %define with_up 0
%define with_pae 0
%define with_debug 0
%endif
# if requested, only build pae kernel
%if %{with_paeonly}
%define with_up 0
%define with_smp 0
%define with_debug 0 %define with_debug 0
%endif %endif
@ -243,6 +254,7 @@ Summary: The Linux kernel
%if %{with_dbgonly} %if %{with_dbgonly}
%if %{debugbuildsenabled} %if %{debugbuildsenabled}
%define with_up 0 %define with_up 0
%define with_pae 0
%endif %endif
%define with_smp 0 %define with_smp 0
%define with_pae 0 %define with_pae 0
@ -1965,6 +1977,7 @@ fi
%changelog %changelog
* Mon Jan 10 2011 Jarod Wilson <jarod@redhat.com> * Mon Jan 10 2011 Jarod Wilson <jarod@redhat.com>
- Add support for local rebuild config option overrides - Add support for local rebuild config option overrides
- Add missing --with/--without pae build flag support
* Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git4.2 * Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git4.2
- Disable DEBUG_SET_MODULE_RONX for now, it causes boot-up to fail since - Disable DEBUG_SET_MODULE_RONX for now, it causes boot-up to fail since