From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751636AbdHQCTg (ORCPT ); Wed, 16 Aug 2017 22:19:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:39722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751461AbdHQCTf (ORCPT ); Wed, 16 Aug 2017 22:19:35 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5203422BE3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Wed, 16 Aug 2017 23:19:30 -0300 From: Arnaldo Carvalho de Melo To: Daniel =?iso-8859-1?Q?D=EDaz?= Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com Subject: Re: [PATCH] tools lib bpf: Fix double file test in Makefile Message-ID: <20170817021930.GA6223@kernel.org> References: <1502814810-960-1-git-send-email-daniel.diaz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1502814810-960-1-git-send-email-daniel.diaz@linaro.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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