Skip to content

Commit 432e3b8

Browse files
author
CKI KWF Bot
committed
Merge: redhat/kernel.spec.template: add drivers/net and drivers/net/hw selftest
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1123 JIRA: https://issues.redhat.com/browse/RHEL-95557 add drivers/net/hw selftest, which is needed by mlxsw related tests. Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Patrick Talbert <ptalbert@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Jarod Wilson <jarod@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 3677a80 + 4307bdc commit 432e3b8

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

redhat/kernel.spec.template

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3229,7 +3229,7 @@ pushd tools/testing/selftests
32293229
export CFLAGS="%{build_cflags}"
32303230
export CXXFLAGS="%{build_cxxflags}"
32313231

3232-
TARGETS="bpf cgroup kmod mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat pid_namespace rlimits timens pidfd"
3232+
TARGETS="bpf cgroup kmod mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/hw iommu cachestat pid_namespace rlimits timens pidfd"
32333233
%{make} %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" ARCH=$Arch V=1 TARGETS="$TARGETS" SKIP_TARGETS="" $force_targets VMLINUX_H="${RPM_VMLINUX_H}"
32343234

32353235
# Restore the original level of source fortification
@@ -3574,12 +3574,24 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
35743574
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
35753575
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
35763576
popd
3577+
# install drivers/net selftests
3578+
pushd tools/testing/selftests/drivers/net
3579+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/{} \;
3580+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/{} \;
3581+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/{} \;
3582+
popd
35773583
# install drivers/net/mlxsw selftests
35783584
pushd tools/testing/selftests/drivers/net/mlxsw
35793585
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;
35803586
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;
35813587
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;
35823588
popd
3589+
# install drivers/net/hw selftests
3590+
pushd tools/testing/selftests/drivers/net/hw
3591+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/hw/{} \;
3592+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/hw/{} \;
3593+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/hw/{} \;
3594+
popd
35833595
# install drivers/net/netdevsim selftests
35843596
pushd tools/testing/selftests/drivers/net/netdevsim
35853597
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \;

0 commit comments

Comments
 (0)