From 795e430c4d055e2325ca25823fc1f10d616d6c62 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 2 Aug 2018 23:35:55 +0800 Subject: [PATCH] objtool, usbip: Build with V=1 by default These two are terse by default and don't respect the KBUILD_VERBOSE environment variable. (I considered adding V=1 to the MAKEFLAGS we use by default in debian/rules.real, but this might have different semantics for the few tools that aren't built using either kbuild or automake.) --- debian/changelog | 1 + debian/rules.d/tools/objtool/Makefile | 2 +- debian/rules.d/tools/usb/usbip/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89440c3c3..1ca6f5002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux (4.18~rc7-1~exp1) UNRELEASED; urgency=medium * Update policy version to 4.2.0: - linux-kbuild: Change "#!/usr/bin/env perl" to "#!/usr/bin/perl" - Build with KBUILD_VERBOSE=1 by default + - objtool, usbip: Build with V=1 by default -- Uwe Kleine-König Sat, 21 Jul 2018 16:52:01 +0200 diff --git a/debian/rules.d/tools/objtool/Makefile b/debian/rules.d/tools/objtool/Makefile index 6b42618d3..9990cde31 100644 --- a/debian/rules.d/tools/objtool/Makefile +++ b/debian/rules.d/tools/objtool/Makefile @@ -5,7 +5,7 @@ all: # for multiple targets and add a wrapper, same as for modpost. # objtool explicitly sets CC and LD to be native tools; we need to override # this on the command line to make cross-builds work. - $(MAKE) -C $(top_srcdir)/tools/objtool O=$(CURDIR) HOSTARCH=$(KERNEL_ARCH) ARCH=x86 CC=$(CC) LD=$(CROSS_COMPILE)ld + $(MAKE) -C $(top_srcdir)/tools/objtool O=$(CURDIR) HOSTARCH=$(KERNEL_ARCH) ARCH=x86 CC=$(CC) LD=$(CROSS_COMPILE)ld V=$(KBUILD_VERBOSE) install: install -D -m755 objtool $(DESTDIR)/$(installdir)/objtool diff --git a/debian/rules.d/tools/usb/usbip/Makefile b/debian/rules.d/tools/usb/usbip/Makefile index 896a8142c..3decaac98 100644 --- a/debian/rules.d/tools/usb/usbip/Makefile +++ b/debian/rules.d/tools/usb/usbip/Makefile @@ -19,10 +19,10 @@ all: --disable-shared \ --disable-static \ --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) - $(MAKE) + $(MAKE) V=$(KBUILD_VERBOSE) install: - $(MAKE) install + $(MAKE) V=$(KBUILD_VERBOSE) install ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) rm -rf $(DESTDIR)/usr/share/man endif