Skip to content

Commit c55c3ac

Browse files
viktormalikfmaurer-rh
authored andcommitted
spec: remove resolve_btfids from kernel-devel
Bugzilla: https://bugzilla.redhat.com/2178930 Upstream status: RHEL-only Since 56a2df7 ("tools/resolve_btfids: Compile resolve_btfids as host program"), resolve_btfids is compiled using HOSTCC. Therefore, it shouldn't be included in the kernel-devel package as its arch could not match the target arch. Only include source files in kernel-devel so that it is recompiled when running 'make prepare'. Signed-off-by: Viktor Malik <vmalik@redhat.com>
1 parent 02bf597 commit c55c3ac

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

redhat/kernel.spec.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,8 @@ BuildKernel() {
21722172
cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
21732173
cp --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
21742174
cp --parents tools/objtool/sync-check.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
2175-
cp -a --parents tools/bpf/resolve_btfids $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
2175+
cp -a --parents tools/bpf/resolve_btfids/main.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
2176+
cp -a --parents tools/bpf/resolve_btfids/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
21762177

21772178
cp --parents security/selinux/include/policycap_names.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
21782179
cp --parents security/selinux/include/policycap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build

0 commit comments

Comments
 (0)