From patchwork Tue Dec 27 20:58:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 36998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1584775wrt; Tue, 27 Dec 2022 13:11:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRWrZ2rOKCUl+7PAHAtxHT1p8PMEO6XyWJDsq/Mg22EIZR/qsmWopkPdvV2frm6cJqgczy X-Received: by 2002:a17:907:98e1:b0:7c1:932c:96d7 with SMTP id ke1-20020a17090798e100b007c1932c96d7mr19393290ejc.58.1672175466641; Tue, 27 Dec 2022 13:11:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672175466; cv=none; d=google.com; s=arc-20160816; b=P9tUPZKQVmJGta+NkcA/kdZ2p99j1eBJfv1tyFx63FlbYD/wgLrKFO4pCYQM4+WT6h 5IBd3xbiecbSjR4BhjYScnS12eqzMl6Uu5kNfKfGElZhMzu+xeHiejCKcJaDUaKlP+yK lbIb5HtNBXvy4gw8d13BkRXunUP4LV4b/hRB3tHbfOsASNvG2SbBx56SbkRkmAZoJdK3 8/x4jvg0K36mu/segd+R0p+yWqTp/7DBvteubIkQD5624tMh8hYXXce1TLA68erKODvX trS9qEnOK/L0nPC/5vtqNouOHhmGIgORrNO/TvgGAec3VdD6s9STS3S2GtZ+jCL/tRnE f7xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=ehjAct0s6Dtd3QExmKTSdmrzR6spJVYTkvftHs1l54Q=; b=C6VX5a1PjIwtzJrPjoFDQllWUlQyjkof+5febzwXTa1w2fd7iavviPtTw8NwSfPBKe dXTMalSIAKAre/Ku3F9R8OXeSWx3tM+k+0zmAPZCjPHHUYekX36fpBrjnSM0vCyAYcOh +wffQjXjYJ5eXbkv7uazft82FUPfzG4fcWhf+NH6NB233Dop29loUVZGvziAvWBEj7RP YqSaJ8zwiM6QLunc0lt7Jbs7URXygVxLkFEmNr1Vz5ZqqECUfqNEo8Gi3WHkMPwBIMrb nCgjG7fYACkZeH1VoOLStoA56BHQPVP/yfByu8cHbJH/6Z4SJzFWFH2J1X1EM+5KrX+v QtGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202211 header.b=ZB0y63PL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw5-20020a170906478500b0078fcfc5d24esi12549254ejc.618.2022.12.27.13.10.42; Tue, 27 Dec 2022 13:11:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202211 header.b=ZB0y63PL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232050AbiL0VIS (ORCPT + 99 others); Tue, 27 Dec 2022 16:08:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232029AbiL0VH5 (ORCPT ); Tue, 27 Dec 2022 16:07:57 -0500 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E8FF8EA3; Tue, 27 Dec 2022 12:58:01 -0800 (PST) Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 3ECB2E30; Tue, 27 Dec 2022 21:58:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202211; t=1672174681; bh=iTS1x7uqMwlfDspIo0ctetklGe1k7CRp879cIKlVM7c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZB0y63PL8nRqMpxjH0+jRziK+uxsALhqd3h1fSdNRG1D2CGP2OSz6i5ixTajQB2iM N6HqHfHBnWcme5y08pEvGXbH0S1ZwETT0XKDO3CUz/e8tAAQkizNt3Q+rHjkLOgcv4 BfnpPgyazO/cP8j0HmMCeh9aupQMbGLpQOzFNLG7lmVi/8N+ylz3NIvmBf8Hz63Sif Nf/dScKChCJYpNd8z7IsS2lPWECwgev//fPgj8Vl5BRiSJOmeFY5yqiCPOz4BVK5Al ny2NQF6dHyB+fquGjP6HBt8l06Jz707dJt00Ziv8/H9CPDU7F0biyfAv5gtORcmegr j63mmpctEGDzA== Date: Tue, 27 Dec 2022 21:58:00 +0100 From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= To: Namhyung Kim Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] perf tools: don't include signature in version strings Message-ID: <7c9637711271f50ec2341fb8a7c29585335dab04.1672174189.git.nabijaczleweli@nabijaczleweli.xyz> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD, PDS_RDNS_DYNAMIC_FP,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS, T_PDS_OTHER_BAD_TLD autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753403062084586755?= X-GMAIL-MSGID: =?utf-8?q?1753403062084586755?= This explodes the build if HEAD is signed, since the generated version is gpg: Signature made Mon 26 Dec 2022 20:34:48 CET, then a few more lines, then the SHA. Signed-off-by: Ahelenia Ziemiańska Acked-by: Namhyung Kim --- tools/perf/Documentation/Makefile | 2 +- tools/perf/util/PERF-VERSION-GEN | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 6e7b88917ca0..ba5d942e4c6a 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile @@ -267,7 +267,7 @@ $(OUTPUT)%.xml : %.txt $(ASCIIDOC) -b docbook -d manpage \ $(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) \ -aperf_date=$(shell git log -1 --pretty="format:%cd" \ - --date=short $<) \ + --date=short --no-show-signature $<) \ -o $@+ $< && \ mv $@+ $@ diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 3cc42821d9b3..d7dc7c28508c 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -19,7 +19,7 @@ TAG= if test -d ../../.git -o -f ../../.git then TAG=$(MAKEFLAGS= make -sC ../.. kernelversion) - CID=$(git log -1 --abbrev=12 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" + CID=$(git log -1 --abbrev=12 --pretty=format:"%h" --no-show-signature 2>/dev/null) && CID="-g$CID" elif test -f ../../PERF-VERSION-FILE then TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g')