From nobody Sun Feb 8 13:16:43 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1978255E29 for ; Mon, 10 Feb 2025 18:35:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739212506; cv=none; b=Gsd63lSFuMBBHc2UxdN9eGNfLZbqzIXvu/NYGnzPcupvwYBcZRSKbAqGf1SWox4x0YUpUnclJJtZJlExCQdBppZVBJWmeYSBx+UwsJIzKzpUxRLLoAVMqk8MDRBOKBY/HlZGypxvADypcbujI+uTxMXcel229YngP1Vkuby3b+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739212506; c=relaxed/simple; bh=m6vPvto3/8VAhwSYAOsb0B0lfqjzn/c3aN5DgiXezEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q2tGSOGBfq2CeW7M71rqjdio5R/KWplVXhEA/G008k6ZcDrfNwT2SmSDvva9aJwWqRbv1xxFQDJV1BYetv7Kzey4HLvkndQr3PmL1N+BQFzFkQCGJyAggYdU0dM0pM46MooVvU86LcckUHCDNCThEMDnIn5wQijyP248pA5zlO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=eoYEbEe3; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="eoYEbEe3" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21fa56e1583so16861045ad.3 for ; Mon, 10 Feb 2025 10:35:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739212503; x=1739817303; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vp4U5RjZNMaLfDL8FhGoAp2lWpVtDVf1/5CCeKs7dXI=; b=eoYEbEe3PbIZxg7miQabqeR5BEYTfaoDPioosHFjvmskgJbDMsdaI+3W3LtsMQO/hv 9qym1BnbAbvHathgSt8ii+ELgBPKwVpxaHWdrxgw5E97kxHQLotEtTjTsJslTL3X0cJY HoGIYFNOtrzk/H+YCrlGO9YsRxU8vVwqUDK1HKKUIQ+WzRR8pOeFBou9f91loeP3OSal U/O2KWs3oxTfTXQAEZxsDriyVz0Q88rdt1j2pLg1tX22nswKShr1+hnNEYXhnxiDIrh5 RWtOpYtRaU6pGSu/F0EFd90djrU3Rlqe2pVERN+o81eg+DautBss+41uJ1dBEHxbb5Hv dMFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739212503; x=1739817303; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vp4U5RjZNMaLfDL8FhGoAp2lWpVtDVf1/5CCeKs7dXI=; b=wGMuVduLAcPZtin52nZzXJXnxAMZqII7imSolvTnwGmdM9cvXNRIW6ejBQhccDhhZz Y4fdRpSdfRuh8kNTCInhCtl+NpPuEaoeBQ7ZVEPYczIxja1V3XaJJsCqYbn+/gVIOJ3z V5Rd18lbjC77X3S35toLZadkJEdnl2M3HLgcP8S10Ms8/p85blbs3qGBj8ogOz+fZcNl tZ9nZGlbJutUno28dj+Nix0qwt0AZ1UKDW6o2FnVLwc5j0hnalODfVo6C6ntLu32QBo4 1kXbt71Xl74GbsW0IAJyvzXgYmGMJJK7bk1WnsxUhnLcdNVdKd/DmW0ebAKvPkgPM2WE 3L9A== X-Forwarded-Encrypted: i=1; AJvYcCXPRLfJOUTWbXtaoWCGRb1wt8tUZNmCE2BYcF1DOUjd9xH834iiZQkm6gjLmaTJa4rqVmo57kTkIRZwh/c=@vger.kernel.org X-Gm-Message-State: AOJu0Yww9+M1ZirxWmpbwipWA1wj32/XPfiuHsIlPFCQQJK7jsj6vzL7 T1CkOCI8Tm2xxOw65XuF+ULm9agRbTLxZEtqTmnA556iBsiKk0iSZdSH1EAfpEk= X-Gm-Gg: ASbGncstaszQJi+t9EYWSCQpe0RY9OBnZPMa8fNUe98pK1B0gnyieelziO+Hizteh0m +rUmIVqYlMDGzGp2tQ1jDHLA8Kqb8qa4Cc8ON7nXbNmMLAIoHcAPU4dqx2y/1Urh2Bk7ZsmEWnd WttdqCa85fVovQ6XPhaF/80GES4wTNql9RXPdpkTJR/khxqY68HzF9YB4OgcaniHO48ihRFjXJ/ rGJ/UPov7GWYi0fbuuuWnrBKcIvUFlDFTho03wMsZwqh+6RclilnOgEo8oaPmTQvjtYchrsTf0C Jx2EuGLDtRfnmfZsKvdcO+365ouBzs8= X-Google-Smtp-Source: AGHT+IGhadsK8o0zywnt3E3VuQTTrNcoOsyBwprzXa7M/vo7zyIHtpYN9nvJLck9Wi1ntjXoOtMSKQ== X-Received: by 2002:a17:902:e547:b0:215:5935:7eef with SMTP id d9443c01a7336-21f4e6b1204mr276368625ad.22.1739212503138; Mon, 10 Feb 2025 10:35:03 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3650e6b5sm82534815ad.46.2025.02.10.10.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 10:35:02 -0800 (PST) From: Charlie Jenkins Date: Mon, 10 Feb 2025 10:34:42 -0800 Subject: [PATCH v2 1/2] tools: Unify top-level quiet infrastructure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250210-quiet_tools-v2-1-b2f18cbf72af@rivosinc.com> References: <20250210-quiet_tools-v2-0-b2f18cbf72af@rivosinc.com> In-Reply-To: <20250210-quiet_tools-v2-0-b2f18cbf72af@rivosinc.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Quentin Monnet , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Josh Poimboeuf , Mykola Lysenko , Shuah Khan , Jiri Kosina , Benjamin Tissoires , Steven Rostedt Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-pm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-input@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4587; i=charlie@rivosinc.com; h=from:subject:message-id; bh=m6vPvto3/8VAhwSYAOsb0B0lfqjzn/c3aN5DgiXezEc=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oqt0vxR7caCa0+ZyG9dZKngbLdN+5YvRDHjY1PZjzMm /m1dc/pjlIWBjEuBlkxRRaeaw3MrXf0y46Klk2AmcPKBDKEgYtTACaySIvhf9Xljw4mVvlWBVbt LR5LFnT/kHJ3/WTcEvg1nEV1bdaJFYwMF3+lXJiW9+7i3rQpEcq7T6yNUPJoX36jOKJlUrlO7Gp JFgA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 Commit f2868b1a66d4 ("perf tools: Expose quiet/verbose variables in Makefile.perf") moved the quiet infrastructure out of tools/build/Makefile.build and into the top-level Makefile.perf file so that the quiet infrastructure could be used throughout perf and not just in Makefile.build. Extract out the quiet infrastructure into Makefile.include so that it can be leveraged outside of perf. Signed-off-by: Charlie Jenkins Fixes: f2868b1a66d4 ("perf tools: Expose quiet/verbose variables in Makefil= e.perf") --- tools/build/Makefile | 8 +------- tools/perf/Makefile.perf | 41 --------------------------------------= --- tools/scripts/Makefile.include | 31 ++++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 49 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index 18ad131f6ea74aebfc3fd6aa6dddfdc00634b66c..63ef2187876169d8daaeed6f7a4= ff27e4b610271 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -17,13 +17,7 @@ $(call allow-override,LD,$(CROSS_COMPILE)ld) =20 export HOSTCC HOSTLD HOSTAR =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - -export Q srctree CC LD +export srctree CC LD =20 MAKEFLAGS :=3D --no-print-directory build :=3D -f $(srctree)/tools/build/Makefile.build dir=3D. obj diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 55d6ce9ea52fb2a57b8632cc6d0ddc501e29cbfc..05c083bb11220486e3246896af4= fa0051f048832 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -161,47 +161,6 @@ export VPATH SOURCE :=3D $(shell ln -sf $(srctree)/tools/perf $(OUTPUT)/source) endif =20 -# Beautify output -# ------------------------------------------------------------------------= --- -# -# Most of build commands in Kbuild start with "cmd_". You can optionally d= efine -# "quiet_cmd_*". If defined, the short log is printed. Otherwise, no log f= rom -# that command is printed by default. -# -# e.g.) -# quiet_cmd_depmod =3D DEPMOD $(MODLIB) -# cmd_depmod =3D $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELR= ELEASE) -# -# A simple variant is to prefix commands with $(Q) - that's useful -# for commands that shall be hidden in non-verbose mode. -# -# $(Q)$(MAKE) $(build)=3Dscripts/basic -# -# To put more focus on warnings, be less verbose as default -# Use 'make V=3D1' to see the full commands - -ifeq ($(V),1) - quiet =3D - Q =3D -else - quiet=3Dquiet_ - Q=3D@ -endif - -# If the user is running make -s (silent mode), suppress echoing of comman= ds -# make-4.0 (and later) keep single letter options in the 1st word of MAKEF= LAGS. -ifeq ($(filter 3.%,$(MAKE_VERSION)),) -short-opts :=3D $(firstword -$(MAKEFLAGS)) -else -short-opts :=3D $(filter-out --%,$(MAKEFLAGS)) -endif - -ifneq ($(findstring s,$(short-opts)),) - quiet=3Dsilent_ -endif - -export quiet Q - # Do not use make's built-in rules # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS +=3D -r diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 0aa4005017c72f10bb7c5e47bc78ec81718c47ef..71703a39f8bc29074eb257d5df8= e01ff151ba23d 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -136,6 +136,33 @@ else NO_SUBDIR =3D : endif =20 +# Beautify output +# ------------------------------------------------------------------------= --- +# +# Most of build commands in Kbuild start with "cmd_". You can optionally d= efine +# "quiet_cmd_*". If defined, the short log is printed. Otherwise, no log f= rom +# that command is printed by default. +# +# e.g.) +# quiet_cmd_depmod =3D DEPMOD $(MODLIB) +# cmd_depmod =3D $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELR= ELEASE) +# +# A simple variant is to prefix commands with $(Q) - that's useful +# for commands that shall be hidden in non-verbose mode. +# +# $(Q)$(MAKE) $(build)=3Dscripts/basic +# +# To put more focus on warnings, be less verbose as default +# Use 'make V=3D1' to see the full commands + +ifeq ($(V),1) + quiet =3D + Q =3D +else + quiet =3D quiet_ + Q =3D @ +endif + # If the user is running make -s (silent mode), suppress echoing of comman= ds # make-4.0 (and later) keep single letter options in the 1st word of MAKEF= LAGS. ifeq ($(filter 3.%,$(MAKE_VERSION)),) @@ -145,9 +172,11 @@ short-opts :=3D $(filter-out --%,$(MAKEFLAGS)) endif =20 ifneq ($(findstring s,$(short-opts)),) - silent=3D1 + quiet=3Dsilent_ endif =20 +export quiet Q + # # Define a callable command for descending to a new directory # --=20 2.43.0 From nobody Sun Feb 8 13:16:43 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50EF8192B84 for ; Mon, 10 Feb 2025 18:35:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739212508; cv=none; b=KyC6G3ATEKqJiCjD+ulNkwsuVh6Pi76OGK7L5pv7vlDGPJKBDKep4nH8JELY0aUyK76hCc8DC7ShOWcJMc19V53a3mR5/9UttMcuvOwviw6DInDpBvZBfPOTwrWrgzDh0cmXXmEO0D9lJCd6Ug6zKT3mfK1YZ+lb2bzquE82NA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739212508; c=relaxed/simple; bh=afFbwZhPvABw9QtnhyLoeWFZ1DAKvScTsQg8dH8fITI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mRbanpgTLH8ahK00+0Rd1R0xzU/rpEDaNzYCWPF6l51HLG7TngYQ39e+nhAW2ckKrE01N86sg/qrDidDaLLUHn9cigGbDlXpk+oN4AK/C/IIxh9GjDfdtOeoAkS9FG8YON7zdhy6zrqKmusCO2+Mm4MXawr0SLtYA2LSVNhJC4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=wajH00IG; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="wajH00IG" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21f50895565so49651825ad.2 for ; Mon, 10 Feb 2025 10:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739212505; x=1739817305; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IZC6hwdmsqFUIUOrfafnyuVDJQQmUYi4erRt9zplJew=; b=wajH00IGPM8LMRdwak4iQ5X/8GVVgAsmyAPewes8oPNsjQM3bjOlOUA9YtHBV1c7U/ A67oPMctVoL53ZcoiBDMuELYSzwst2w1W5RU+QFjc7sVOS5Kz/bJxFQ1RbibRH3QruxP tjXL48K9hCUN+r1rVPx15W5KwyXxZlmvkn9s5UYiSfMhULPzlNVTmfKNxECE6fWLhvF7 odMY2Mfe9PosoCZ431uGchljvlbZUDD4RLQfCpoMCWJNnjqB5CCn6K2Ge/PKRGq4qwqs 7WlAKScmbbPtfJVxv6pCt0Y7k1f9ZfIq/DrH70zuQbwmSSIxVja0irQ4MGEGSVquYXYk krlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739212505; x=1739817305; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IZC6hwdmsqFUIUOrfafnyuVDJQQmUYi4erRt9zplJew=; b=bcQYJ+p/J0dfxakkt4kMHIS5xqJSFK4sYL8GBZio5GRGe/2z35CF9YvZQbZwUVdiHK xqDrehYWj5fHAi9r48MIdC3IsEL3JVYT/7gWCAVNB7Lc63wkZqTSmT01Uy1gcFbQnCbl h52kDnOXnk216AS6XldvxswhScUiowNA61EV6xO690lqZS2p/1vAj8mDpvIJ7YeWE6Nv W0DU+gcLriL01RzzXnlu6wrdiPsrDbhCtVfoGepnbuD08oIXmzICVnZNOpO6c5i/uhNh uL0LUE/S5ChVCQ3MWvsWsO0SmfbaAB2KtFe18hTs9v2u/NfTMY7a7SKLFuSHxVA3qIbi 3Z3g== X-Forwarded-Encrypted: i=1; AJvYcCWyeV+y1+BjPS8Zg3X9EfeCfqkvTTN5UUh+94PsrhrBxhKu3szx01BDTaoCEWmfYBDjFT0ePO/cyidBD0A=@vger.kernel.org X-Gm-Message-State: AOJu0YyjjhH6vDHeIVW5pbJg1tw8X6wDu0TGzxiF9e8WgeUIdnVrIWM3 pZ/31wqrFouu+GgLqE/SwowSRZoBMXU2w3WxIYSyGDGY/cftJ5cogV5DQs21RHw= X-Gm-Gg: ASbGncsT2QvRRuUY63kKntfb6gB+75n8ukOgGcGjwmHi1xIiSU5/QlNAZ4B3oGezn/F 24TGNXITkfULFbLdPd0wPxGNq5vMoJG7eabEgREjZsolCjvFj3e1ebjkBQlUBTbcR0Q7k7in733 XTuloIuaE8vuTG01IPpneXGELRdwIz7KRSoNZ22RSD3CbH2ZFAFPtwfmBkOXeWiGzkJKeeh1AWV o4Rta6n0BMM+rwEW5Wa/Z08BHE33C7g/sSkH0xKjEomaL86XIfeolrTyihQt5cvBfjZhPu9DPSO iIgCKjhy5yoXifVFSV11FJPI8k6q6TE= X-Google-Smtp-Source: AGHT+IHtp08VQuun5C1yu46ll/uFsvIp/+Quz02mNlB+fHEav3tysjyfH3BKOpexgQ5joBYuNTCv8A== X-Received: by 2002:a17:903:2f83:b0:215:89a0:416f with SMTP id d9443c01a7336-21fb64460e9mr7223045ad.30.1739212505447; Mon, 10 Feb 2025 10:35:05 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3650e6b5sm82534815ad.46.2025.02.10.10.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 10:35:04 -0800 (PST) From: Charlie Jenkins Date: Mon, 10 Feb 2025 10:34:43 -0800 Subject: [PATCH v2 2/2] tools: Remove redundant quiet setup Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250210-quiet_tools-v2-2-b2f18cbf72af@rivosinc.com> References: <20250210-quiet_tools-v2-0-b2f18cbf72af@rivosinc.com> In-Reply-To: <20250210-quiet_tools-v2-0-b2f18cbf72af@rivosinc.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Quentin Monnet , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Josh Poimboeuf , Mykola Lysenko , Shuah Khan , Jiri Kosina , Benjamin Tissoires , Steven Rostedt Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-pm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-input@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10090; i=charlie@rivosinc.com; h=from:subject:message-id; bh=afFbwZhPvABw9QtnhyLoeWFZ1DAKvScTsQg8dH8fITI=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oqt0u/FxybH+p4mC9Zx/PRSWbdmew734Zp/dy93/bY9 p6Fp/eWdpSyMIhxMciKKbLwXGtgbr2jX3ZUtGwCzBxWJpAhDFycAjCRehtGhl1F0efO6NpNY9/B rPv9RaPrVk75XSdeKIvcjDnmKnts6gWG/0l3TM5cu5r8r35nrNzheXeO5/UUalspTHr6qfh6fGf zbn4A X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 Q is exported from Makefile.include so it is not necessary to manually set it. Signed-off-by: Charlie Jenkins Acked-by: Quentin Monnet --- tools/arch/arm64/tools/Makefile | 6 ------ tools/bpf/Makefile | 6 ------ tools/bpf/bpftool/Documentation/Makefile | 6 ------ tools/bpf/bpftool/Makefile | 6 ------ tools/bpf/resolve_btfids/Makefile | 2 -- tools/bpf/runqslower/Makefile | 5 +---- tools/lib/bpf/Makefile | 13 ------------- tools/lib/perf/Makefile | 13 ------------- tools/lib/thermal/Makefile | 13 ------------- tools/objtool/Makefile | 6 ------ tools/testing/selftests/bpf/Makefile.docs | 6 ------ tools/testing/selftests/hid/Makefile | 2 -- tools/thermal/lib/Makefile | 13 ------------- tools/tracing/latency/Makefile | 6 ------ tools/tracing/rtla/Makefile | 6 ------ tools/verification/rv/Makefile | 6 ------ 16 files changed, 1 insertion(+), 114 deletions(-) diff --git a/tools/arch/arm64/tools/Makefile b/tools/arch/arm64/tools/Makef= ile index 7b42feedf647190ad498de0937e8fb557e40f39c..de4f1b66ef0148b7bfd0fd16655= ad854c7542240 100644 --- a/tools/arch/arm64/tools/Makefile +++ b/tools/arch/arm64/tools/Makefile @@ -13,12 +13,6 @@ AWK ?=3D awk MKDIR ?=3D mkdir RM ?=3D rm =20 -ifeq ($(V),1) -Q =3D -else -Q =3D @ -endif - arm64_tools_dir =3D $(top_srcdir)/arch/arm64/tools arm64_sysreg_tbl =3D $(arm64_tools_dir)/sysreg arm64_gen_sysreg =3D $(arm64_tools_dir)/gen-sysreg.awk diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index 243b79f2b451e52ca196f79dc46befd1b3dab458..062bbd6cd048e9e42f9bc8f9972= ec96594f3dbd2 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -27,12 +27,6 @@ srctree :=3D $(patsubst %/,%,$(dir $(CURDIR))) srctree :=3D $(patsubst %/,%,$(dir $(srctree))) endif =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - FEATURE_USER =3D .bpf FEATURE_TESTS =3D libbfd disassembler-four-args disassembler-init-styled FEATURE_DISPLAY =3D libbfd diff --git a/tools/bpf/bpftool/Documentation/Makefile b/tools/bpf/bpftool/D= ocumentation/Makefile index 4315652678b9f2e27e48b7815f3b9ddc70a57165..bf843f328812e10dd65a73f355f= 74e6825ad95b9 100644 --- a/tools/bpf/bpftool/Documentation/Makefile +++ b/tools/bpf/bpftool/Documentation/Makefile @@ -5,12 +5,6 @@ INSTALL ?=3D install RM ?=3D rm -f RMDIR ?=3D rmdir --ignore-fail-on-non-empty =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - prefix ?=3D /usr/local mandir ?=3D $(prefix)/man man8dir =3D $(mandir)/man8 diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index dd9f3ec842017f1dd24054bf3a0986d546811dc4..6ea4823b770cbbe7fd9eb7da799= 56cc1dae1f204 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -7,12 +7,6 @@ srctree :=3D $(patsubst %/,%,$(dir $(srctree))) srctree :=3D $(patsubst %/,%,$(dir $(srctree))) endif =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - BPF_DIR =3D $(srctree)/tools/lib/bpf =20 ifneq ($(OUTPUT),) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/M= akefile index 4b8079f294f65b284481e9a2bf6ff52594a4669a..afbddea3a39c64ffb2efc874a36= 37b6401791c5b 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -5,10 +5,8 @@ include ../../scripts/Makefile.arch srctree :=3D $(abspath $(CURDIR)/../../../) =20 ifeq ($(V),1) - Q =3D msg =3D else - Q =3D @ ifeq ($(silent),1) msg =3D else diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index c4f1f1735af659c2e660a322dbf6912d9a5724bc..e49203ebd48c18607a6136a9e80= 5ccf16ee960d3 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -26,10 +26,7 @@ VMLINUX_BTF_PATHS :=3D $(if $(O),$(O)/vmlinux) \ VMLINUX_BTF_PATH :=3D $(or $(VMLINUX_BTF),$(firstword \ $(wildcard $(VMLINUX_BTF_PATHS)))) =20 -ifeq ($(V),1) -Q =3D -else -Q =3D @ +ifneq ($(V),1) MAKEFLAGS +=3D --no-print-directory submake_extras :=3D feature_display=3D0 endif diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 857a5f7b413d6dc4cbe7bc4167496674dd08d875..168140f8e6461bd06db40e23d21= a3fb8847ccbf4 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -53,13 +53,6 @@ include $(srctree)/tools/scripts/Makefile.include =20 # copy a bit from Linux kbuild =20 -ifeq ("$(origin V)", "command line") - VERBOSE =3D $(V) -endif -ifndef VERBOSE - VERBOSE =3D 0 -endif - INCLUDES =3D -I$(or $(OUTPUT),.) \ -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include @@ -96,12 +89,6 @@ override CFLAGS +=3D $(CLANG_CROSS_FLAGS) # flags specific for shared library SHLIB_FLAGS :=3D -DSHARED -fPIC =20 -ifeq ($(VERBOSE),1) - Q =3D -else - Q =3D @ -endif - # Disable command line variables (CFLAGS) override from top # level Makefile (perf), otherwise build Makefile will get # the same command line setup. diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile index 3a9b2140aa048ea919c69ed2240bf0ea444dbf21..e9a7ac2c062e2b398c2f22af419= 07b62815ca07e 100644 --- a/tools/lib/perf/Makefile +++ b/tools/lib/perf/Makefile @@ -39,19 +39,6 @@ libdir =3D $(prefix)/$(libdir_relative) libdir_SQ =3D $(subst ','\'',$(libdir)) libdir_relative_SQ =3D $(subst ','\'',$(libdir_relative)) =20 -ifeq ("$(origin V)", "command line") - VERBOSE =3D $(V) -endif -ifndef VERBOSE - VERBOSE =3D 0 -endif - -ifeq ($(VERBOSE),1) - Q =3D -else - Q =3D @ -endif - TEST_ARGS :=3D $(if $(V),-v) =20 # Set compile option CFLAGS diff --git a/tools/lib/thermal/Makefile b/tools/lib/thermal/Makefile index 8890fd57b110ccc1a837d37624a5dead00f18656..a1f5e388644d31d36f973d3ddce= 48d036ee0a083 100644 --- a/tools/lib/thermal/Makefile +++ b/tools/lib/thermal/Makefile @@ -39,19 +39,6 @@ libdir =3D $(prefix)/$(libdir_relative) libdir_SQ =3D $(subst ','\'',$(libdir)) libdir_relative_SQ =3D $(subst ','\'',$(libdir_relative)) =20 -ifeq ("$(origin V)", "command line") - VERBOSE =3D $(V) -endif -ifndef VERBOSE - VERBOSE =3D 0 -endif - -ifeq ($(VERBOSE),1) - Q =3D -else - Q =3D @ -endif - # Set compile option CFLAGS ifdef EXTRA_CFLAGS CFLAGS :=3D $(EXTRA_CFLAGS) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index f56e2772753414ff8d3462bdebbc8e95e7667fcd..7a65948892e569cbe1d6e5a78db= 68bb35102cd26 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -46,12 +46,6 @@ HOST_OVERRIDES :=3D CC=3D"$(HOSTCC)" LD=3D"$(HOSTLD)" AR= =3D"$(HOSTAR)" AWK =3D awk MKDIR =3D mkdir =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - BUILD_ORC :=3D n =20 ifeq ($(SRCARCH),x86) diff --git a/tools/testing/selftests/bpf/Makefile.docs b/tools/testing/self= tests/bpf/Makefile.docs index eb6a4fea8c794d8354363ac8daa0baac3e3bd060..f7f9e7088bb38c7507282990fb6= 2921ca7a636d2 100644 --- a/tools/testing/selftests/bpf/Makefile.docs +++ b/tools/testing/selftests/bpf/Makefile.docs @@ -7,12 +7,6 @@ INSTALL ?=3D install RM ?=3D rm -f RMDIR ?=3D rmdir --ignore-fail-on-non-empty =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - prefix ?=3D /usr/local mandir ?=3D $(prefix)/man man2dir =3D $(mandir)/man2 diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests= /hid/Makefile index 0336353bd15f0d56dbed6c8fa02f53c234f949e1..2839d2612ce3a70f4332f8e8865= 86e9cca6f03cb 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -43,10 +43,8 @@ TEST_GEN_PROGS =3D hid_bpf hidraw # $3 - target (assumed to be file); only file name will be emitted; # $4 - optional extra arg, emitted as-is, if provided. ifeq ($(V),1) -Q =3D msg =3D else -Q =3D @ msg =3D @printf ' %-8s%s %s%s\n' "$(1)" "$(if $(2), [$(2)])" "$(notdir $(= 3))" "$(if $(4), $(4))"; MAKEFLAGS +=3D --no-print-directory submake_extras :=3D feature_display=3D0 diff --git a/tools/thermal/lib/Makefile b/tools/thermal/lib/Makefile index f2552f73a64c7eb1be24c27b3a1414617391315b..056d212f25cf51cd8c02260fbe2= ef28dda5e4acb 100644 --- a/tools/thermal/lib/Makefile +++ b/tools/thermal/lib/Makefile @@ -39,19 +39,6 @@ libdir =3D $(prefix)/$(libdir_relative) libdir_SQ =3D $(subst ','\'',$(libdir)) libdir_relative_SQ =3D $(subst ','\'',$(libdir_relative)) =20 -ifeq ("$(origin V)", "command line") - VERBOSE =3D $(V) -endif -ifndef VERBOSE - VERBOSE =3D 0 -endif - -ifeq ($(VERBOSE),1) - Q =3D -else - Q =3D @ -endif - # Set compile option CFLAGS ifdef EXTRA_CFLAGS CFLAGS :=3D $(EXTRA_CFLAGS) diff --git a/tools/tracing/latency/Makefile b/tools/tracing/latency/Makefile index 6518b03e05c71b4fa84498f9628adf81a38c9f56..257a56b1899f23837de533353e9= c2cebdb6035bd 100644 --- a/tools/tracing/latency/Makefile +++ b/tools/tracing/latency/Makefile @@ -37,12 +37,6 @@ FEATURE_TESTS +=3D libtracefs FEATURE_DISPLAY :=3D libtraceevent FEATURE_DISPLAY +=3D libtracefs =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - all: $(LATENCY-COLLECTOR) =20 include $(srctree)/tools/build/Makefile.include diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile index 8b5101457c70b48e9c720f1ba53293f1307c15a2..0b61208db604ec0754024c3007d= b6b2fe74a613c 100644 --- a/tools/tracing/rtla/Makefile +++ b/tools/tracing/rtla/Makefile @@ -37,12 +37,6 @@ FEATURE_DISPLAY :=3D libtraceevent FEATURE_DISPLAY +=3D libtracefs FEATURE_DISPLAY +=3D libcpupower =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - all: $(RTLA) =20 include $(srctree)/tools/build/Makefile.include diff --git a/tools/verification/rv/Makefile b/tools/verification/rv/Makefile index 411d62b3d8eb93abf85526ad33cafd783df86bc1..5b898360ba4818b12e8a16c27bd= 88c75d0076fb9 100644 --- a/tools/verification/rv/Makefile +++ b/tools/verification/rv/Makefile @@ -35,12 +35,6 @@ FEATURE_TESTS +=3D libtracefs FEATURE_DISPLAY :=3D libtraceevent FEATURE_DISPLAY +=3D libtracefs =20 -ifeq ($(V),1) - Q =3D -else - Q =3D @ -endif - all: $(RV) =20 include $(srctree)/tools/build/Makefile.include --=20 2.43.0