[PATCH] tools lib bpf: Fix double file test in Makefile

[PATCH] tools lib bpf: Fix double file test in Makefile

[Daniel Díaz]

The Makefile verifies the same file exists twice:
  test -f ../../../include/uapi/linux/bpf.h -a \
       -f ../../../include/uapi/linux/bpf.h

The purpose of the check is to ensure the diff (immediately
after the test) doesn't fail with these two files:
  /tools/include/uapi/linux/bpf.h
  /include/uapi/linux/bpf.h

Same recipe for bpf_common:
  test -f ../../../include/uapi/linux/bpf_common.h -a \
       -f ../../../include/uapi/linux/bpf_common.h

This corrects the location of the tests.

Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
 tools/lib/bpf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 1f5300e..9216c31 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -154,10 +154,10 @@ all: fixdep $(VERSION_FILES) all_cmd
 all_cmd: $(CMD_TARGETS)
 
 $(BPF_IN): force elfdep bpfdep
-	@(test -f ../../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
+	@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
 	(diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \
 	echo "Warning: tools/include/uapi/linux/bpf.h differs from kernel" >&2 )) || true
-	@(test -f ../../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \
+	@(test -f ../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \
 	(diff -B ../../include/uapi/linux/bpf_common.h ../../../include/uapi/linux/bpf_common.h >/dev/null) || \
 	echo "Warning: tools/include/uapi/linux/bpf_common.h differs from kernel" >&2 )) || true
 	$(Q)$(MAKE) $(build)=libbpf
-- 
2.7.4

Re: [PATCH] tools lib bpf: Fix double file test in Makefile

[Arnaldo Carvalho de Melo]

Em Tue, Aug 15, 2017 at 11:33:30AM -0500, Daniel Díaz escreveu:
> The Makefile verifies the same file exists twice:
>   test -f ../../../include/uapi/linux/bpf.h -a \
>        -f ../../../include/uapi/linux/bpf.h
> 
> The purpose of the check is to ensure the diff (immediately
> after the test) doesn't fail with these two files:
>   /tools/include/uapi/linux/bpf.h
>   /include/uapi/linux/bpf.h
> 
> Same recipe for bpf_common:
>   test -f ../../../include/uapi/linux/bpf_common.h -a \
>        -f ../../../include/uapi/linux/bpf_common.h
> 
> This corrects the location of the tests.

Patch doesn't apply, conflicts with:

[acme@jouet linux]$ git log --oneline -1 8255e1efc193f
8255e1efc193 perf build: Clarify open-coded header version warning message

That is in my tip/perf/core and on tip/perf/core, that is where perf
development for next version takes place.

I'll fix it up.

Thanks,

- Arnaldo
 
> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
> ---
>  tools/lib/bpf/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index 1f5300e..9216c31 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -154,10 +154,10 @@ all: fixdep $(VERSION_FILES) all_cmd
>  all_cmd: $(CMD_TARGETS)
>  
>  $(BPF_IN): force elfdep bpfdep
> -	@(test -f ../../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
> +	@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
>  	(diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \
>  	echo "Warning: tools/include/uapi/linux/bpf.h differs from kernel" >&2 )) || true
> -	@(test -f ../../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \
> +	@(test -f ../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \
>  	(diff -B ../../include/uapi/linux/bpf_common.h ../../../include/uapi/linux/bpf_common.h >/dev/null) || \
>  	echo "Warning: tools/include/uapi/linux/bpf_common.h differs from kernel" >&2 )) || true
>  	$(Q)$(MAKE) $(build)=libbpf
> -- 
> 2.7.4