[PATCH] bpftool: Fix version string in recursive builds

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Ben Hutchings <benh@debian.org>
Newsgroups	linux.debian.kernel
Subject	[PATCH] bpftool: Fix version string in recursive builds
Date	Fri, 14 Aug 2020 02:00:01 +0200
Message-ID	<ADvix-35c-1@gated-at.bofh.it> (permalink)
X-Mailbox-Line	From debian-kernel-request@lists.debian.org Thu Aug 13 23:58:56 2020
Old-Return-Path	<ben@decadent.org.uk>
X-Amavis-Spam-Status	No, score=-11.679 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -4.6
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qDbXVdCdHGoSgWSk"
Content-Disposition	inline
X-Sa-Exim-Connect-IP	192.168.4.242
X-Sa-Exim-Mail-From	ben@decadent.org.uk
X-Sa-Exim-Scanned	No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false
X-Mailing-List	<debian-kernel@lists.debian.org> archive/latest/124917
List-ID	<debian-kernel.lists.debian.org>
List-URL	<https://lists.debian.org/debian-kernel/>
List-Archive	https://lists.debian.org/msgid-search/20200813235837.GA497088@decadent.org.uk
Approved	robomod@news.nic.it
Lines	61
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Cc	bpf@vger.kernel.org, debian-kernel@lists.debian.org
X-Original-Date	Fri, 14 Aug 2020 00:58:37 +0100
X-Original-Message-ID	<20200813235837.GA497088@decadent.org.uk>
Xref	csiph.com linux.debian.kernel:67772

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

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))

Back to linux.debian.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] bpftool: Fix version string in recursive builds Ben Hutchings <benh@debian.org> - 2020-08-14 02:00 +0200
  Re: [PATCH] bpftool: Fix version string in recursive builds Ben Hutchings <benh@debian.org> - 2020-08-15 00:20 +0200

csiph-web