From 00b03ffa70e8773eee7200fd2235aed2b9ab689a Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 10 Jul 2015 09:47:55 -0400 Subject: [PATCH] Linux v4.2-rc1-62-gc4b5fd3fb205 - Build perf with NO_PERF_READ_VDSO32 on all arches --- config-x86-32-generic | 1 - kernel.spec | 12 ++++++------ sources | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config-x86-32-generic b/config-x86-32-generic index 8ecb52c47..865fb9004 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -83,7 +83,6 @@ CONFIG_X86_LONGRUN=y CONFIG_X86_HT=y - # CONFIG_4KSTACKS is not set CONFIG_PCI_DIRECT=y diff --git a/kernel.spec b/kernel.spec index 02e2fec23..62dc3bb9c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1738,12 +1738,8 @@ BuildKernel %make_target %kernel_image %{pae} BuildKernel %make_target %kernel_image %endif -%ifarch ppc64le -%define no32bit NO_PERF_READ_VDSO32=1 -%endif - %global perf_make \ - make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 %{?no32bit} WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} + make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} %if %{with_perf} # perf %{perf_make} DESTDIR=$RPM_BUILD_ROOT all @@ -2192,6 +2188,10 @@ fi # # %changelog +* Fri Jul 10 2015 Josh Boyer - 4.2.0-0.rc1.git3.1 +- Linux v4.2-rc1-62-gc4b5fd3fb205 +- Build perf with NO_PERF_READ_VDSO32 on all arches + * Thu Jul 09 2015 Josh Boyer - Use git to apply patches diff --git a/sources b/sources index dd8295977..ab1b369c4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz 84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz bfd9e8391b982eedf8037d697ab7c1b6 patch-4.2-rc1.xz -8909d96e27719907f8126216d6a8b4f5 patch-4.2-rc1-git2.xz +0db6c4ec627998b16c240019e38d37bd patch-4.2-rc1-git3.xz