From: Don Zickus dzickus@redhat.com
Revert "redhat: fix elf got hardening for vm tools"
This reverts commit eb5aebd77015bc57616c5d05a7b6206c8ff871cb.
A recent rework of the tools/vm area relies on a proper CFLAGS definition to include the proper header files. The kernel.spec file purposely overwrites the CFLAGS to get the right switches to pass rpminspect. As a consequence tools/vm fails to compile.
For now just revert the change and await a proper fix.
To duplicate:
cd tools/vm make CFLAGS= slabinfo page_owner_sort
make -C ../lib/api make[1]: Entering directory '/home/dzickus/devel/git/kernel-ark/tools/lib/api' /usr/bin/make -C /home/dzickus/devel/git/kernel-ark/tools/build CFLAGS= LDFLAGS= fixdep CC fd/array.o LD fd/libapi-in.o CC fs/fs.o fs/fs.c:17:10: fatal error: debug-internal.h: No such file or directory 17 | #include "debug-internal.h" | ^~~~~~~~~~~~~~~~~~ compilation terminated. make[3]: *** [/home/dzickus/devel/git/kernel-ark/tools/build/Makefile.build:97: fs/fs.o] Error 1 make[2]: *** [/home/dzickus/devel/git/kernel-ark/tools/build/Makefile.build:139: fs] Error 2 make[1]: *** [Makefile:79: libapi-in.o] Error 2 make[1]: Leaving directory '/home/dzickus/devel/git/kernel-ark/tools/lib/api' make: *** [Makefile:19: ../lib/api/libapi.a] Error 2
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 @@ -2340,7 +2340,7 @@ pushd tools/gpio/ popd # build VM tools pushd tools/vm/ -%{tools_make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" slabinfo page_owner_sort +%{tools_make} slabinfo page_owner_sort popd pushd tools/tracing/rtla %{tools_make}
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2236
kernel@lists.fedoraproject.org