[v3,bpf-next,02/14] samples: bpf: makefile: fix cookie_uid_helper_example obj build

Message ID 20190916105433.11404-3-ivan.khoronzhuk@linaro.org
State Superseded
Headers show
Series
  • samples: bpf: improve/fix cross-compilation
Related show

Commit Message

Ivan Khoronzhuk Sept. 16, 2019, 10:54 a.m.
Don't list userspace "cookie_uid_helper_example" object in list for
bpf objects.

'always' target is used for listing bpf programs, but
'cookie_uid_helper_example.o' is a user space ELF file, and covered
by rule `per_socket_stats_example`, so shouldn't be in 'always'.
Let us remove `always += cookie_uid_helper_example.o`, which avoids
breaking cross compilation due to mismatched includes.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>

---
 samples/bpf/Makefile | 1 -
 1 file changed, 1 deletion(-)

-- 
2.17.1

Comments

Andrii Nakryiko Sept. 16, 2019, 8:18 p.m. | #1
On Mon, Sep 16, 2019 at 3:59 AM Ivan Khoronzhuk
<ivan.khoronzhuk@linaro.org> wrote:
>

> Don't list userspace "cookie_uid_helper_example" object in list for

> bpf objects.

>

> 'always' target is used for listing bpf programs, but

> 'cookie_uid_helper_example.o' is a user space ELF file, and covered

> by rule `per_socket_stats_example`, so shouldn't be in 'always'.

> Let us remove `always += cookie_uid_helper_example.o`, which avoids

> breaking cross compilation due to mismatched includes.

>

> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>

> ---


Acked-by: Andrii Nakryiko <andriin@fb.com>


>  samples/bpf/Makefile | 1 -

>  1 file changed, 1 deletion(-)

>

> diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile

> index f50ca852c2a8..43dee90dffa4 100644

> --- a/samples/bpf/Makefile

> +++ b/samples/bpf/Makefile

> @@ -145,7 +145,6 @@ always += sampleip_kern.o

>  always += lwt_len_hist_kern.o

>  always += xdp_tx_iptunnel_kern.o

>  always += test_map_in_map_kern.o

> -always += cookie_uid_helper_example.o

>  always += tcp_synrto_kern.o

>  always += tcp_rwnd_kern.o

>  always += tcp_bufs_kern.o

> --

> 2.17.1

>

Patch

diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index f50ca852c2a8..43dee90dffa4 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -145,7 +145,6 @@  always += sampleip_kern.o
 always += lwt_len_hist_kern.o
 always += xdp_tx_iptunnel_kern.o
 always += test_map_in_map_kern.o
-always += cookie_uid_helper_example.o
 always += tcp_synrto_kern.o
 always += tcp_rwnd_kern.o
 always += tcp_bufs_kern.o