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=8ea5c....
Change:
+%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit 8ea5c347be799068cb798f6fb5869a67d6626628
Author: Justin M. Forbes <jforbes(a)fedoraproject.org>
Date: Mon Aug 30 12:05:13 2021 -0500
Linux v5.14.0
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/kernel-tools.spec b/kernel-tools.spec
index e113a07..d891af2 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -7,14 +7,14 @@
# 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 0
-%global baserelease 1
+%global released_kernel 1
+%global baserelease 300
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
# on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
# which yields a base_sublevel of 0.
-%global base_sublevel 13
+%global base_sublevel 14
## If this is a released kernel ##
%if 0%{?released_kernel}
@@ -34,7 +34,7 @@
%global upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 7
+%global rcrev 0
# 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
+* Mon Aug 30 2021 Justin M. Forbes <jforbes(a)fedoraproject.org> - 5.14.0-300
+- Linux v5.14.0
+
* Mon Aug 23 2021 Justin M. Forbes <jforbes(a)fedoraproject.org> -
5.14.0-0.rc7.git0.1
- Linux v5.14-rc7
diff --git a/sources b/sources
index 3a6ea0f..a30358d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (linux-5.13.tar.xz) =
a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
-SHA512 (patch-5.14-rc7.xz) =
0cfee4c52c118264c6b6663992c6783e8aae112224c58984d6cfc762ec538e41a123f2597ac1d33a951403915e6cc3974a0940e0b515d9863b77e57b4a2ed4ed
+SHA512 (linux-5.14.tar.xz) =
8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64