diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-11-19 14:17:23 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-11-19 14:17:23 -0500 |
| commit | ad6cd36832165317bee01afe00131bfccfaf1e89 (patch) | |
| tree | 68dd62b8299bc54e1b7a118318de6338b617a2b6 /kernel.spec | |
| parent | 4dd05057118da257f5057dbd8dbbbd2b972110e8 (diff) | |
| download | kernel-ad6cd36832165317bee01afe00131bfccfaf1e89.tar.gz kernel-ad6cd36832165317bee01afe00131bfccfaf1e89.tar.xz kernel-ad6cd36832165317bee01afe00131bfccfaf1e89.zip | |
Add various patches to fix perf build on non-x86 arches
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 6954628df..33e9b927e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -538,7 +538,10 @@ BuildRequires: sparse >= 0.4.1 %endif %if %{with_perf} BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison -BuildRequires: audit-libs-devel libunwind-devel +BuildRequires: audit-libs-devel +%ifnarch s390 s390x +BuildRequires: libunwind-devel +%endif %endif %if %{with_tools} BuildRequires: pciutils-devel gettext @@ -764,6 +767,8 @@ Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch Patch22070: irqnr-build.patch Patch22071: uapi-prefix-fix.patch +Patch22073: perf-uapi-fixes2.patch + # END OF PATCH DEFINITIONS %endif @@ -1471,6 +1476,8 @@ ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch ApplyPatch irqnr-build.patch ApplyPatch uapi-prefix-fix.patch +ApplyPatch perf-uapi-fixes2.patch + # END OF PATCH APPLICATIONS %endif @@ -2338,6 +2345,9 @@ fi # ||----w | # || || %changelog +* Mon Nov 19 2012 Josh Boyer <jwboyer@redhat.com> +- Add various patches to fix perf build on non-x86 arches + * Mon Nov 19 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc6.git1.1 - Linux v3.7-rc6-21-g3587b1b - Reenable debugging options. |