The package rpms/kernel-tools.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kernel-tools.git/commit/?id=8c740....
Change:
+%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit 8c740cdd981a7949a5bd411eeb5ba52ab6a344a2
Author: Justin M. Forbes <jforbes(a)fedoraproject.org>
Date: Tue Jul 20 09:58:41 2021 -0500
Linux v5.13.3 rebase
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 9226b3a..a4ac91a 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -8,7 +8,7 @@
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
%global released_kernel 1
-%global baserelease 50
+%global baserelease 100
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -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}
@@ -485,6 +499,9 @@ popd
%license linux-%{kversion}/COPYING
%changelog
+* Tue Jul 20 2021 Justin M. Forbes <jforbes(a)fedoraproject.org> - 5.13.3-100
+- Linux v5.13.3 rebase
+
* Tue Jul 20 2021 Justin M. Forbes <jforbes(a)fedoraproject.org> - 5.13.3-50
- Linux v5.13.3 prebuild