From: Ben Hutchings <benh@debian.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: bpf@vger.kernel.org, debian-kernel@lists.debian.org
Subject: [PATCH] bpftool: Fix version string in recursive builds
Date: Fri, 14 Aug 2020 00:58:37 +0100 [thread overview]
Message-ID: <20200813235837.GA497088@decadent.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
When bpftool is built as part of a Debian package build, which itself
uses make, "bpftool version" shows:
bpftool vmake[4]: Entering directory /build/linux-5.8/tools/bpf/bpftool 5.8.8.0 make[4]: Leaving directory /build/linux-5.8
Although we pass the "--no-print-directory" option, this is overridden
by the environment variable "MAKEFLAGS=w". Clear MAKEFLAGS for the
"make kernelversion" command.
I have no explanation for the doubled ".8" in the version string, but
this seems to fix that as well.
Signed-off-by: Ben Hutchings <benh@debian.org>
---
tools/bpf/bpftool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index 9e85f101be85..7fbad8cbd171 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -25,7 +25,7 @@ endif
LIBBPF = $(LIBBPF_PATH)libbpf.a
-BPFTOOL_VERSION := $(shell make -rR --no-print-directory -sC ../../.. kernelversion)
+BPFTOOL_VERSION := $(shell MAKEFLAGS= make -rR --no-print-directory -sC ../../.. kernelversion)
$(LIBBPF): FORCE
$(if $(LIBBPF_OUTPUT),@mkdir -p $(LIBBPF_OUTPUT))
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next reply other threads:[~2020-08-13 23:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 23:58 Ben Hutchings [this message]
2020-08-14 15:43 ` [PATCH] bpftool: Fix version string in recursive builds Yonghong Song
2020-08-14 22:17 ` Ben Hutchings
2020-08-14 22:55 ` Yonghong Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200813235837.GA497088@decadent.org.uk \
--to=benh@debian.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=debian-kernel@lists.debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox