From patchwork Tue Aug 15 16:33:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 110185 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp5889970qge; Tue, 15 Aug 2017 09:33:51 -0700 (PDT) X-Received: by 10.84.178.4 with SMTP id y4mr31582350plb.135.1502814831204; Tue, 15 Aug 2017 09:33:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502814831; cv=none; d=google.com; s=arc-20160816; b=f9WehBjEohs9LODgx04BPi4fcTL81kaX3qCgYuHVtAD4wogPplNutvfLdmVVBj7tnj GgAy/1ZvIZnYZNEFgaSkPnivcJmT5ZWMhgHy2w7D3DAZkLuJamrKfmjwJ9CvWY1rkCMz MLIh2aJtvZK796iX83dpYVEh2yJOavGDldZ4cX5HfHyFdyw7qrlQt0VX8u6/GzHbppvJ pLZPbJHbGLcRnpwhfoRw4cFcQGNyRcyWeOGdoXK8LeOqmIKFxkeKG4JTSTzLItkd6C31 1IHySz3iRMH4qSHVzUrZiLhDUHf78+gAHwz2VuQvl4/ZA/80nd3ahJ1NWlWmFfdJ+gsh QyoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=EJX2syBLTSEylAXm7cKtkHB2aligfdRDW5NRNfAoAf8=; b=oNjKyUsGQ2ir/GgO1RHk/XCq7h0xdixXaKaaBiOcUcv0Ho+MgpSuFNTmqag2lHZP77 vXlMgM6Z+lyubYRcqlAcjuV+2SofKC7oL+t27XqmaNIlFNjvJmlC6qXn7Zpe3t6bNse3 oX1AbzVFhbI+XKBbAc38q/pSEN6xjC030DfIN+1/a0MCwgcf2NV7UqWk7eEeU+xT5sNX B+BHx/nXGXjaGjOAOfXsEKVPCJPJmnoRdpfV3jaL5MdgyG8gUzSDskdmjWybcFofqooK rRzdfIE8oAle8GyAXw/wrJwwarhoVOqeVfKEWFghFfvp6qiwEcwK3F1PcTMkozv/YCqn LbgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A0P+5w/T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p187si5589857pga.174.2017.08.15.09.33.50; Tue, 15 Aug 2017 09:33:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A0P+5w/T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753446AbdHOQdt (ORCPT + 26 others); Tue, 15 Aug 2017 12:33:49 -0400 Received: from mail-oi0-f42.google.com ([209.85.218.42]:35009 "EHLO mail-oi0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602AbdHOQdq (ORCPT ); Tue, 15 Aug 2017 12:33:46 -0400 Received: by mail-oi0-f42.google.com with SMTP id e124so12149787oig.2 for ; Tue, 15 Aug 2017 09:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EJX2syBLTSEylAXm7cKtkHB2aligfdRDW5NRNfAoAf8=; b=A0P+5w/TnvfEXPqWQ2F0lK0QW4VUR8FQQg9YBQw5rYsABiNHqXL/Q4U6b0CpprYB88 oPpNdq+BTtr7MZXDRH0ZDWxjRCQ6ETtAu+TWZq0Wm/38t6CwCbGdl56ipIsEAMryZAWX jS3g2lwbBljDqb9TWZ7pNeTGRUC9myfCzugFk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EJX2syBLTSEylAXm7cKtkHB2aligfdRDW5NRNfAoAf8=; b=dF6pMqYLxUKDnXS8In7T6e80SmUcc2IJ3w6AHS7akDDU0SLvVW5kgt3MwIEdWi682c oTcc6ieDwq1p1A0QQOiJkIlp0upeMFzaqKYPWbCAKFpFjnK5b/u7PFBmqr9b3SIUi43s T9u6s332HLBIPAmRM3WBHjMry0NzA03Ztqx1+II/yW1qAHsLgwPnTfniaHhDUK6GNYzS uZQhWZpTq8XRjE1mSkbO/0wuAkRwd464suoCatbTwqWJPDCXTELWD0PNiK6LmlHcYwUw CmPfHUC4e3LstOdZ3z8yck+qLFJX+Ge1hByXqjzyc4UZCOVX/S/pXl4cSBDTBvvlG35Y DOhg== X-Gm-Message-State: AHYfb5h4TTSr45fgsH73pKrLRyvDr3EXVraw+9NAkTBiwtSOElo/dbmA oQC9G0DjU8D01fY8o+m+Qu0s X-Received: by 10.202.190.196 with SMTP id o187mr26377650oif.264.1502814825220; Tue, 15 Aug 2017 09:33:45 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink67-82.telefonia.InterCable.net. [201.172.67.82]) by smtp.googlemail.com with ESMTPSA id r136sm11013649oie.20.2017.08.15.09.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Aug 2017 09:33:43 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: linux-kernel@vger.kernel.org Cc: acme@kernel.org, peterz@infradead.org, mingo@redhat.com, =?utf-8?q?Dan?= =?utf-8?b?aWVsIETDrWF6?= Subject: [PATCH] tools lib bpf: Fix double file test in Makefile Date: Tue, 15 Aug 2017 11:33:30 -0500 Message-Id: <1502814810-960-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 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