From patchwork Mon Dec 26 19:50:15 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: 36698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1079838wrt; Mon, 26 Dec 2022 12:30:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXu669MUpm+ldzJkA+cpeKk1NEFQbkdL3HTFUAEXmGKwXilxdwDwQUcc8T3g9cFYsQD2jPFD X-Received: by 2002:a17:90b:2642:b0:218:a672:bcab with SMTP id pa2-20020a17090b264200b00218a672bcabmr21424498pjb.14.1672086631081; Mon, 26 Dec 2022 12:30:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672086631; cv=none; d=google.com; s=arc-20160816; b=04uSae7DOPZZFNs8JWg9H20dQQkAFFOzjgrtwzdDIjxRFP8NMND2K+ipmuZbdo9g2i Cl2Qa3NfX1eaesyfruFnH10fwVFTdHmhMMzUDmU4GRGELW3k608gn3QLLNu7upbAA4tV dj01cL9sZ6zfiCb+3sx3ZZcs/VBq+0xLIsvgD4uI61jQs3ty//TL9+MLhlPueNnNQ9yX usdWVwPppGJrPAIrk2pH1llSYGilddGX9FlfdsSyKopHDd454txuxk/gYCcJ2SYTtO7q 3wO1EDGXGdLYQhi/rj/vl5Eac7pCF3MleIid+VuMQSpOPPaKAShlfUZk8Iu7RNKUMJz5 UqJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:from:date :dkim-signature; bh=P+3n5tX96DSCxIk9U5z4XHOsX/ITd8l2QHBafJt+KWY=; b=sZNcYccg8HbL6QnR1qk0qPeGgq0RnKQ0oQhpt64IZDKTuB6mU00YVtbkPgAvtGlde0 Mftw+uOO7DtMwBP6g+e/yfsZIZ2IAjJQnqSKNMOoOV1QZ0aofcLDUKh7vhLnz9UgrN6w 9pPtdmxSdjyy4MroBsiN5hmKZ2/ZZSkEQs3ATwmIRCnBkxa8Qvkn3S7PVnF0FYMDyNFo pZgV9WHtHDxKUBTzoCZeekqiIyfnBFFQRfM757ePDFvIqbXuA/PsRUwuWqOH7eI/QBe8 wUxz5cRUsTImmwyI7LvVgabUmO0+2YQBgcwQylpNsVCntxjHmO5MT5PdKwz0woUfHWJv 954g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202211 header.b=qWfxwCKj; 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 w15-20020a17090aaf8f00b00225ded35323si6014810pjq.61.2022.12.26.12.30.16; Mon, 26 Dec 2022 12:30:31 -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=qWfxwCKj; 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 S232248AbiLZTuV (ORCPT + 99 others); Mon, 26 Dec 2022 14:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232300AbiLZTuT (ORCPT ); Mon, 26 Dec 2022 14:50:19 -0500 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4186A55AB; Mon, 26 Dec 2022 11:50:18 -0800 (PST) Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 6396ED16; Mon, 26 Dec 2022 20:50:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202211; t=1672084216; bh=YCslYJBvGc4yDOQPyvEncGq7pKRSJi+w2wNx2nl1G/0=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=qWfxwCKjmFtNu0dEuzmX6QAKBEHIGhVuz3c7oU5eYjKC8x0WYAdY89ZPqhqAu1mvl scqT7envogZf7iv2Kq7AGzWlXrfXZBewQBVuqX3DxVJef8ufXpKC2fKqQchFnMLH8R HcOs2vtpjEd6SeBe+RHb1pb6FJNeu614pNWp8VzJw8UfAYMTx+6JAdDNQrv5Tmxaob lVYQhbbg3pHh8qid3sNXSu+2f1U+rqvHZaxibJGln2elku/PPHB67IHMh4gUXlux1U JI3T/sqMlDPSjtowVewsAWpLRL5AfcEUKdCc9PhuW/oG+4vrFmI8EJ5zWarygP7Jwm Y6nLiM0wvSTWQ== Date: Mon, 26 Dec 2022 20:50:15 +0100 From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= 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 2/1] perf tools: don't include signature in version strings Message-ID: <20221226195015.venelpockrns7uk4@tarta.nabijaczleweli.xyz> References: <20221226193517.qynxfceqgzvr4qwu@tarta.nabijaczleweli.xyz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221226193517.qynxfceqgzvr4qwu@tarta.nabijaczleweli.xyz> User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD, MISSING_HEADERS,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 To: unlisted-recipients:; (no To-header on input) 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?1753309911471038314?= X-GMAIL-MSGID: =?utf-8?q?1753309911471038314?= 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')