tools/bpf: Move linux/types.h for selftests and bpftool
authorTobias Klauser <tklauser@distanz.ch>
Fri, 13 Mar 2020 11:31:05 +0000 (12:31 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 13 Mar 2020 19:56:34 +0000 (20:56 +0100)
commitbcd66b10b5e956b3e81f76a61abfed2501ff4038
treea6a91557c5486f547cdc8cf2c747ba1388c1dc15
parentdcce11d545cc5d04c3fb529a8e2a0da987389139
tools/bpf: Move linux/types.h for selftests and bpftool

Commit fe4eb069edb7 ("bpftool: Use linux/types.h from source tree for
profiler build") added a build dependency on tools/testing/selftests/bpf
to tools/bpf/bpftool. This is suboptimal with respect to a possible
stand-alone build of bpftool.

Fix this by moving tools/testing/selftests/bpf/include/uapi/linux/types.h
to tools/include/uapi/linux/types.h.

This requires an adjustment in the include search path order for the
tests in tools/testing/selftests/bpf so that tools/include/linux/types.h
is selected when building host binaries and
tools/include/uapi/linux/types.h is selected when building bpf binaries.

Verified by compiling bpftool and the bpf selftests on x86_64 with this
change.

Fixes: fe4eb069edb7 ("bpftool: Use linux/types.h from source tree for profiler build")
Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20200313113105.6918-1-tklauser@distanz.ch
tools/bpf/bpftool/Makefile
tools/include/uapi/linux/types.h [moved from tools/testing/selftests/bpf/include/uapi/linux/types.h with 100% similarity]
tools/testing/selftests/bpf/Makefile