Skip to content

Commit 4663f4b

Browse files
committed
redhat: fix build/install targets in netfilter kselftest
JIRA: https://issues.redhat.com/browse/RHEL-21061 Upstream Status: ARK commit 4f01575610115cae380a56ce9a5db580495bf578 commit 4f01575610115cae380a56ce9a5db580495bf578 Author: Davide Caratti <[email protected]> Date: Mon Dec 2 12:24:21 2024 +0100 redhat: fix build/install targets in netfilter kselftest Xu Du reports missing netfilter kselftests in kernel-selftests-internal: after upstream commit 3f18934 ("selftests: netfilter: move to net subdir") we need to update build and install targets to take account of this new path. Reported-by: Xu Du <[email protected]> Signed-off-by: Davide Caratti <[email protected]> Signed-off-by: Florian Westphal <[email protected]>
1 parent f4d424b commit 4663f4b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

redhat/kernel.spec.template

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2780,7 +2780,7 @@ fi
27802780
pushd tools/testing/selftests
27812781
# We need to install here because we need to call make with ARCH set which
27822782
# doesn't seem possible to do in the install section.
2783-
%{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 cachestat drivers/net" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" DEFAULT_INSTALL_HDR_PATH=0 install
2783+
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm livepatch net net/forwarding net/mptcp net/netfilter tc-testing memfd drivers/net/bonding iommu cachestat drivers/net" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" DEFAULT_INSTALL_HDR_PATH=0 install
27842784

27852785
# 'make install' for bpf is broken and upstream refuses to fix it.
27862786
# Install the needed files manually.
@@ -3158,11 +3158,11 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/livepatch/{}
31583158
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \;
31593159
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \;
31603160
popd
3161-
# install netfilter selftests
3162-
pushd tools/testing/selftests/netfilter
3163-
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
3164-
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
3165-
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
3161+
# install net/netfilter selftests
3162+
pushd tools/testing/selftests/net/netfilter
3163+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/netfilter/{} \;
3164+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/netfilter/{} \;
3165+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/netfilter/{} \;
31663166
popd
31673167

31683168
# install memfd selftests

0 commit comments

Comments
 (0)