diff --git a/0001-perf-Use-python-config-includes-rather-than-cflags.patch b/0001-perf-Use-python-config-includes-rather-than-cflags.patch deleted file mode 100644 index b97f5b5..0000000 --- a/0001-perf-Use-python-config-includes-rather-than-cflags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d50c9eec6d8c83dcf86f9c7f91c6e886af20b15f Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Mon, 9 Jul 2018 14:31:19 -0400 -Subject: [PATCH] perf: Use python-config --includes rather than --cflags - -Builds started failing in Fedora on Python 3.7 with: - - `.gnu.debuglto_.debug_macro' referenced in section - `.gnu.debuglto_.debug_macro' of - util/scripting-engines/trace-event-python.o: defined in discarded - section - -In Fedora, Python 3.7 added -flto to the list of --cflags and since it -was only applied to the Python perf engine, linking failed. It's not the -first time the addition of flags has broken builds: c6707fdef7e2 ("perf -tools: Fix up build in hardnened environments") fixed a similar problem. - -Signed-off-by: Jeremy Cline ---- - tools/perf/Makefile.config | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index b5ac356ba323..f5a3b402589e 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -207,8 +207,7 @@ ifdef PYTHON_CONFIG - PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null) - PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS)) - PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil -- PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null) -- PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS)) -+ PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --includes 2>/dev/null) - FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) - endif - --- -2.17.1 - diff --git a/kernel-tools.spec b/kernel-tools.spec index 171be6f..2fed9ca 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -5,7 +5,7 @@ # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. %global released_kernel 0 -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -30,7 +30,7 @@ # The next upstream release sublevel (base_sublevel+1) %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 4 +%global rcrev 5 # Set rpm version accordingly %global rpmversion 4.%{upstream_sublevel}.0 %endif @@ -110,7 +110,6 @@ Patch3: 0001-tools-include-Sync-vmx.h-header-for-FSF-removal.patch Patch4: 0001-tools-lib-Remove-FSF-address.patch Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch Patch8: 0001-Switch-to-python3.patch -Patch9: 0001-perf-Use-python-config-includes-rather-than-cflags.patch Name: kernel-tools Summary: Assortment of tools for the Linux kernel License: GPLv2 @@ -200,7 +199,6 @@ cd linux-%{kversion} %patch4 -p1 %patch6 -p1 %patch8 -p1 -%patch9 -p1 # END OF PATCH APPLICATIONS @@ -428,6 +426,9 @@ popd %license linux-%{kversion}/COPYING %changelog +* Mon Jul 16 2018 Laura Abbott - 4.18.0-0.rc5.git0.1 +- Linux v4.18-rc5 + * Fri Jul 13 2018 Fedora Release Engineering - 4.18.0-0.rc4.git0.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 617fd9c..021a795 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.18-rc4.xz) = 6d2b502a0a183b3612d3fe64d7836d12087db18cb7446842b777b4e936c60da58faa22830668b1af2acb903ccbf5577bb7b337127c6d6b7778f51c4aa3296c08 +SHA512 (patch-4.18-rc5.xz) = 238685483f0eb95d95678dd4ddd83c044d3888bd4ccc6966c6f9e8209a21aea86c18ba4a8e10c9e0d78037bc4809a93196f44ee23e8f9463641a16ca1ea97574