From: Herton R. Krzesinski <herton(a)redhat.com>
rpmspec: switch iio and gpio tools to use tools_make
Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1956988
In the past, some of the kernel tools Makefiles didn't allow the override of
CFLAGS, which made them compiled without stack protector and without position
independent code. This triggers CI failures in RHEL with annocheck.
However, since upstream commits 4ccc98a48958da9f89beb71c66a4e05468727951
(tools gpio: Allow overriding CFLAGS) and 572974610273d58b35d6632eb3a07b6f048c5b89
(tools iio: Override CFLAGS assignments), we can override the
compiler flags, so just convert the build of iio and gpio tools to
use tools_make macro as other tools, which passes the correct CFLAGS.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2206,12 +2206,10 @@ pushd tools/thermal/tmon/
%{tools_make}
popd
pushd tools/iio/
-# Needs to be fixed to pick up CFLAGS
-%{__make}
+%{tools_make}
popd
pushd tools/gpio/
-# Needs to be fixed to pick up CFLAGS
-%{__make}
+%{tools_make}
popd
# build VM tools
pushd tools/vm/
@@ -2466,10 +2464,10 @@ pushd tools/thermal/tmon
%{tools_make} INSTALL_ROOT=%{buildroot} install
popd
pushd tools/iio
-%{__make} DESTDIR=%{buildroot} install
+%{tools_make} DESTDIR=%{buildroot} install
popd
pushd tools/gpio
-%{__make} DESTDIR=%{buildroot} install
+%{tools_make} DESTDIR=%{buildroot} install
popd
install -m644 -D %{SOURCE2002} %{buildroot}%{_sysconfdir}/logrotate.d/kvm_stat
pushd tools/kvm/kvm_stat
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1276