2022-07-13 06:37:31

by Guillaume Tucker

Subject: [PATCH] selftests/landlock: drop deprecated headers dependency

The khdr make target has been removed, so drop it from the landlock
Makefile dependencies as well as related include paths that are
standard for headers in the kernel tree.

Signed-off-by: Guillaume Tucker <[email protected]>
Reported-by: Anders Roxell <[email protected]>
---
tools/testing/selftests/landlock/Makefile | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/testing/selftests/landlock/Makefile b/tools/testing/selftests/landlock/Makefile
index 1313e44e8fb9..a6959df28eb0 100644
--- a/tools/testing/selftests/landlock/Makefile
+++ b/tools/testing/selftests/landlock/Makefile
@@ -11,13 +11,8 @@ TEST_GEN_PROGS_EXTENDED := true
OVERRIDE_TARGETS := 1
include ../lib.mk

-khdr_dir = $(top_srcdir)/usr/include
-
-$(khdr_dir)/linux/landlock.h: khdr
- @:
-
$(OUTPUT)/true: true.c
$(LINK.c) $< $(LDLIBS) -o $@ -static

-$(OUTPUT)/%_test: %_test.c $(khdr_dir)/linux/landlock.h ../kselftest_harness.h common.h
- $(LINK.c) $< $(LDLIBS) -o $@ -lcap -I$(khdr_dir)
+$(OUTPUT)/%_test: %_test.c ../kselftest_harness.h common.h
+ $(LINK.c) $< $(LDLIBS) -o $@ -lcap
--
2.30.2

2022-07-14 20:48:18

by Shuah Khan

Subject: Re: [PATCH] selftests/landlock: drop deprecated headers dependency

On 7/13/22 12:35 AM, Guillaume Tucker wrote:
> The khdr make target has been removed, so drop it from the landlock
> Makefile dependencies as well as related include paths that are
> standard for headers in the kernel tree.
>
> Signed-off-by: Guillaume Tucker <[email protected]>
> Reported-by: Anders Roxell <[email protected]>
> ---
> tools/testing/selftests/landlock/Makefile | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>

Applied to linux-kselftest next for 5.20-rc1

thanks,
-- Shuah