| Message ID | 20230127135755.79929-27-mathieu.desnoyers@efficios.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 28fc3d4ae3d5ea93aaab0894f3e3853867eeaa2c |
| Headers | show |
| Series | selftests: Fix incorrect kernel headers search path | expand |
On 1/27/23 06:57, Mathieu Desnoyers wrote: > Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents > building against kernel headers from the build environment in scenarios > where kernel headers are installed into a specific output directory > (O=...). > > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > Cc: Shuah Khan <shuah@kernel.org> > Cc: linux-kselftest@vger.kernel.org > Cc: Ingo Molnar <mingo@redhat.com> > Cc: <stable@vger.kernel.org> [5.18+] > --- > tools/testing/selftests/sync/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile > index d0121a8a3523..df0f91bf6890 100644 > --- a/tools/testing/selftests/sync/Makefile > +++ b/tools/testing/selftests/sync/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > CFLAGS += -O2 -g -std=gnu89 -pthread -Wall -Wextra > -CFLAGS += -I../../../../usr/include/ > +CFLAGS += $(KHDR_INCLUDES) > LDFLAGS += -pthread > > .PHONY: all clean Adding seccomp maintainers: kees, I plan to take this through kselftest unless there are conflicts. In case there are conflicts and you want to take this through yours Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On 1/30/23 09:44, Shuah Khan wrote: > On 1/27/23 06:57, Mathieu Desnoyers wrote: >> Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents >> building against kernel headers from the build environment in scenarios >> where kernel headers are installed into a specific output directory >> (O=...). >> >> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> >> Cc: Shuah Khan <shuah@kernel.org> >> Cc: linux-kselftest@vger.kernel.org >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: <stable@vger.kernel.org> [5.18+] >> --- >> tools/testing/selftests/sync/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile >> index d0121a8a3523..df0f91bf6890 100644 >> --- a/tools/testing/selftests/sync/Makefile >> +++ b/tools/testing/selftests/sync/Makefile >> @@ -1,6 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> CFLAGS += -O2 -g -std=gnu89 -pthread -Wall -Wextra >> -CFLAGS += -I../../../../usr/include/ >> +CFLAGS += $(KHDR_INCLUDES) >> LDFLAGS += -pthread >> .PHONY: all clean > > Adding seccomp maintainers: > > kees, > > I plan to take this through kselftest unless there are conflicts. > In case there are conflicts and you want to take this through yours > > Acked-by: Shuah Khan <skhan@linuxfoundation.org> > Sorry wrong message. I am taking this one through mine. -- Shuah
diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile index d0121a8a3523..df0f91bf6890 100644 --- a/tools/testing/selftests/sync/Makefile +++ b/tools/testing/selftests/sync/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O2 -g -std=gnu89 -pthread -Wall -Wextra -CFLAGS += -I../../../../usr/include/ +CFLAGS += $(KHDR_INCLUDES) LDFLAGS += -pthread .PHONY: all clean
Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents building against kernel headers from the build environment in scenarios where kernel headers are installed into a specific output directory (O=...). Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Shuah Khan <shuah@kernel.org> Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar <mingo@redhat.com> Cc: <stable@vger.kernel.org> [5.18+] --- tools/testing/selftests/sync/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)