diff --git a/kernel-tools.spec b/kernel-tools.spec index fa2a67f..eacc8fb 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 2 # Set rpm version accordingly %global rpmversion 5.%{upstream_sublevel}.0 %endif @@ -75,6 +75,10 @@ BuildRequires: asciidoc xmlto libcap-devel BuildRequires: opencsd-devel openssl-devel libbabeltrace-devel libtraceevent-devel BuildRequires: libbpf-devel BuildRequires: clang llvm +# bpftool will look for a matching vmlinux.h here +%ifnarch i686 armvv7hl +BuildRequires: kernel-devel +%endif # Used to mangle unversioned shebangs to be Python 3 BuildRequires: /usr/bin/pathfix.py %ifnarch s390x %{arm} @@ -272,8 +276,18 @@ pushd tools/gpio/ %{tools_make} popd +# This is a bit messy, but if we have a kernel-devel installed from this version, and it includes a vmlinux.h +# we want to use that. Otherwise, we need to pass an empty so it will generate one from the running kernel. +%ifnarch i686 armv7hl +develpackage=$(rpm -qa | grep "kernel-devel" | grep %{kversion}) +vmlinux_h=$(rpm -ql $develpackage | grep vmlinux.h) +if [ -f $vmlinux_h ]; then + RPM_VMLINUX_H=$vmlinux_h +fi +%endif + %global bpftool_make \ - make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT V=1 + make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT VMLINUX_H="${RPM_VMLINUX_H}" V=1 pushd tools/bpf/bpftool %{bpftool_make} @@ -486,6 +500,9 @@ popd %license linux-%{kversion}/COPYING %changelog +* Tue Jul 20 2021 Justin M. Forbes - 5.14.0-0.rc2.git0.1 +- Linux v5.14-rc2 + * Mon Jul 12 2021 Justin M. Forbes - 5.14.0-0.rc1.git0.1 - Linux v5.14-rc1 diff --git a/sources b/sources index bd28f8c..4928cbc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.13.tar.xz) = a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e -SHA512 (patch-5.14-rc1.xz) = a41a6b8d70e4789457d76bd2fa6b5bfccc698a7225f78b62de03c51c4a570d2d23311492ea188360e86fe701e05e7c1b747c5e000b24bf7774c4b06f30b098b5 +SHA512 (patch-5.14-rc2.xz) = 9b1708520ffb310f2204f77c9cdcc0f36727f7586eb550703a4ac388782f6b498a50dbf9d149638d1b81505da22ebe86ecdc565d5f6294b80327e498e0759e60