Skip to content

Commit 1a53d39

Browse files
committed
Merge: redhat/spec: package full bpftool in selftests
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1053 JIRA: https://issues.redhat.com/browse/RHEL-91378 Upstream Status: RHEL-only test_bpftool.sh selftest fails because selftests is packaged with bootstrap bpftool. The full bpftool is built already when compiling so replace bootstrap bpftool with the full bpftool in selftests package. Signed-off-by: Gregory Bell <grbell@redhat.com> Approved-by: Viktor Malik <vmalik@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
2 parents 72af79e + e83d058 commit 1a53d39

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

redhat/kernel.spec.template

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,6 +3250,11 @@ rm -f %{buildroot}/usr/libexec/kselftests/bpf/urandom_read
32503250
rm -f %{buildroot}/usr/libexec/kselftests/bpf/no_alu32/urandom_read
32513251
rm -f %{buildroot}/usr/libexec/kselftests/bpf/cpuv4/urandom_read
32523252

3253+
3254+
# Copy bpftool to kselftests so selftests is packaged with
3255+
# the full bpftool instead of bootstrap bpftool
3256+
cp ./bpf/tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool
3257+
32533258
popd
32543259
%{log_msg "end build selftests"}
32553260
%endif

0 commit comments

Comments
 (0)