Skip to content

Commit 15eb70f

Browse files
committed
Merge: redhat: Add cgroup kselftests to kernel-selftests-internal
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4587 JIRA: https://issues.redhat.com/browse/RHEL-43555 Upstream Status: RHEL only Add cgroup kselftests to kernel-selftests-internal. Signed-off-by: Waiman Long <longman@redhat.com> Approved-by: Derek Barbosa <debarbos@redhat.com> Approved-by: Joel Savitz <jsavitz@redhat.com> Approved-by: Phil Auld <pauld@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents f0fafe0 + 7ee4c20 commit 15eb70f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

redhat/kernel.spec.template

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2757,7 +2757,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
27572757
pushd tools/testing/selftests
27582758
# We need to install here because we need to call make with ARCH set which
27592759
# doesn't seem possible to do in the install section.
2760-
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" DEFAULT_INSTALL_HDR_PATH=0 install
2760+
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" DEFAULT_INSTALL_HDR_PATH=0 install
27612761

27622762
# 'make install' for bpf is broken and upstream refuses to fix it.
27632763
# Install the needed files manually.
@@ -3084,6 +3084,12 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/mm/{} \;
30843084
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \;
30853085
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \;
30863086
popd
3087+
# install cgroup selftests
3088+
pushd tools/testing/selftests/cgroup
3089+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
3090+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
3091+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/cgroup/{} \;
3092+
popd
30873093
# install drivers/net/mlxsw selftests
30883094
pushd tools/testing/selftests/drivers/net/mlxsw
30893095
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;

0 commit comments

Comments
 (0)