diff --git a/0001-Initialize-nl_pid-so-gcc-shuts-up.patch b/0001-Initialize-nl_pid-so-gcc-shuts-up.patch deleted file mode 100644 index b8e5080..0000000 --- a/0001-Initialize-nl_pid-so-gcc-shuts-up.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6d23065901549562b69fc84f34279d4635e5e9f0 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Fri, 3 Apr 2020 21:25:00 -0400 -Subject: [PATCH] libbpf: Initialize *nl_pid so gcc 10 is happy - -Builds of Fedora's kernel-tools package started to fail with "may be -used uninitialized" warnings for nl_pid in bpf_set_link_xdp_fd() and -bpf_get_link_xdp_info() on the s390 architecture. - -Although libbpf_netlink_open() always returns a negative number when it -does not set *nl_pid, the compiler does not determine this and thus -believes the variable might be used uninitialized. Assuage gcc's fears -by explicitly initializing nl_pid. - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1807781 -Signed-off-by: Jeremy Cline ---- - tools/lib/bpf/netlink.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c -index 18b5319025e19..9a14694176de0 100644 ---- a/tools/lib/bpf/netlink.c -+++ b/tools/lib/bpf/netlink.c -@@ -142,7 +142,7 @@ static int __bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd, - struct ifinfomsg ifinfo; - char attrbuf[64]; - } req; -- __u32 nl_pid; -+ __u32 nl_pid = 0; - - sock = libbpf_netlink_open(&nl_pid); - if (sock < 0) -@@ -288,7 +288,7 @@ int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info, - { - struct xdp_id_md xdp_id = {}; - int sock, ret; -- __u32 nl_pid; -+ __u32 nl_pid = 0; - __u32 mask; - - if (flags & ~XDP_FLAGS_MASK || !info_size) --- -2.26.0 - diff --git a/kernel-tools.spec b/kernel-tools.spec index 5735a2f..5a07e63 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -34,7 +34,7 @@ %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 1 +%global rcrev 3 # Set rpm version accordingly %global rpmversion 5.%{upstream_sublevel}.0 %endif @@ -109,8 +109,6 @@ Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch # rpmlint cleanup Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch -Patch7: 0001-Initialize-nl_pid-so-gcc-shuts-up.patch - Name: kernel-tools Summary: Assortment of tools for the Linux kernel License: GPLv2 @@ -217,7 +215,6 @@ cd linux-%{kversion} %patch0 -p1 %patch6 -p1 -%patch7 -p1 # END OF PATCH APPLICATIONS @@ -515,6 +512,9 @@ popd %license linux-%{kversion}/COPYING %changelog +* Sun Apr 26 2020 Justin Forbes - 5.7.0-0.rc3.git0.1 +- Linux v5.7-rc3 + * Tue Apr 14 2020 Michael Petlan - 5.6.0-0.rc7.git0.2 - Add libperf, libperf-devel and libperf-debuginfo packages diff --git a/sources b/sources index 85946be..4e43f6d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.6.tar.xz) = 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9 -SHA512 (patch-5.7-rc1.xz) = fa7e6f796ebcb275b2e7e42e62fdee9e20a1e3065c95850a2d5d46bf979f2d762997f8536d3ede4b6938ab7de96d20332bd02a62ecb87b6f36ad67a9ed866479 +SHA512 (patch-5.7-rc3.xz) = f9552530b61735a6511ec67da015df788075c0043fb5ea94c543e5d08aaaa93a33c11c52854037188be0d27ebc2800a5328dbefc893a55179fe614a6ea1a5bca