diff --git a/0001-cpupower-Remove-FSF-address.patch b/0001-cpupower-Remove-FSF-address.patch deleted file mode 100644 index 0d41a7f..0000000 --- a/0001-cpupower-Remove-FSF-address.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3766ef6d79da0f2219f8f052085da4102de2890e Mon Sep 17 00:00:00 2001 -From: Laura Abbott -Date: Thu, 14 Dec 2017 17:14:04 -0800 -Subject: [PATCH] cpupower: Remove FSF address -To: Thomas Renninger -To: Shuah Khan -Cc: linux-pm@vger.kernel.org -Cc: linux-kernel@vger.kernel.org - - -Checkpatch in the kernel now complains about having the FSF address -in comments. Other tools such as rpmlint are now starting to do the -same thing. Remove the FSF address to reduce warnings on multiple tools. - -Signed-off-by: Laura Abbott ---- -For context, I'm updating the packaging for the cpupower tools in Fedora which -requires a code/output review. This got flagged during that review. ---- - tools/power/cpupower/lib/cpufreq.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h -index 3b005c39f068..60beaf5ed2ea 100644 ---- a/tools/power/cpupower/lib/cpufreq.h -+++ b/tools/power/cpupower/lib/cpufreq.h -@@ -11,10 +11,6 @@ - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - #ifndef __CPUPOWER_CPUFREQ_H__ --- -2.14.3 - diff --git a/0001-tools-lib-subcmd-pager.c-do-not-alias-select-params.patch b/0001-tools-lib-subcmd-pager.c-do-not-alias-select-params.patch deleted file mode 100644 index 37c0f04..0000000 --- a/0001-tools-lib-subcmd-pager.c-do-not-alias-select-params.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 85721e6bfc5da3c8f7971c4acb1a0ad16fb2c16a Mon Sep 17 00:00:00 2001 -From: Sergey Senozhatsky -Date: Thu, 1 Feb 2018 13:29:38 +1100 -Subject: [PATCH] tools/lib/subcmd/pager.c: do not alias select() params - -Use a separate fd set for select()-s exception fds param to fix the -following gcc warning: - -pager.c:36:12: error: passing argument 2 to restrict-qualified - parameter aliases with argument 4 [-Werror=restrict] - select(1, &in, NULL, &in, NULL); - ^~~ ~~~ - -Link: http://lkml.kernel.org/r/20180101105626.7168-1-sergey.senozhatsky@gmail.com -Signed-off-by: Sergey Senozhatsky -Cc: Arnaldo Carvalho de Melo -Signed-off-by: Andrew Morton -Signed-off-by: Stephen Rothwell ---- - tools/lib/subcmd/pager.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c -index 5ba754d17952..9997a8805a82 100644 ---- a/tools/lib/subcmd/pager.c -+++ b/tools/lib/subcmd/pager.c -@@ -30,10 +30,13 @@ static void pager_preexec(void) - * have real input - */ - fd_set in; -+ fd_set exception; - - FD_ZERO(&in); -+ FD_ZERO(&exception); - FD_SET(0, &in); -- select(1, &in, NULL, &in, NULL); -+ FD_SET(0, &exception); -+ select(1, &in, NULL, &exception, NULL); - - setenv("LESS", "FRSX", 0); - } --- -2.14.3 - diff --git a/kernel-tools.spec b/kernel-tools.spec index 262693d..8688978 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -4,7 +4,7 @@ # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 %global baserelease 1 %global fedora_build %{baserelease} @@ -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 0 +%global rcrev 1 # Set rpm version accordingly %global rpmversion 4.%{upstream_sublevel}.0 %endif @@ -106,12 +106,10 @@ Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch # rpmlint cleanup Patch1: 0001-perf-Remove-FSF-address.patch -Patch2: 0001-cpupower-Remove-FSF-address.patch Patch3: 0001-tools-include-Sync-vmx.h-header-for-FSF-removal.patch Patch4: 0001-tools-lib-Remove-FSF-address.patch Patch5: 0001-tools-power-Don-t-make-man-pages-executable.patch Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch -Patch7: 0001-tools-lib-subcmd-pager.c-do-not-alias-select-params.patch Patch8: 0001-Switch-to-python3.patch Name: kernel-tools Summary: Assortment of tools for the Linux kernel @@ -182,12 +180,10 @@ cd linux-%{kversion} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 # END OF PATCH APPLICATIONS diff --git a/sources b/sources index aeeee17..a26ce45 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea -SHA512 (perf-man-4.15.tar.gz) = 257ade73a2906093045bc54e2fe4363c13dbc707424ec437c1937df0c917a38f52ff083af529eacbcbdff4563b67f727c2991c5018912517d3509dabcf287beb +SHA512 (patch-4.16-rc1.xz) = bedbdd6d8e08734083b03ef453e4f46b17016a936ebbd0a1908df7b5a3bdcfc0990d35f4dff83fd83008e4dfe326ccc9f406080cd8818c2d24e20eadaf37598b