From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: "Ahelenia Ziemiańska" <nabijaczleweli@nabijaczleweli.xyz>
Cc: Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] perf tools: don't include signature in version strings
Date: Mon, 2 Jan 2023 12:34:53 -0300 [thread overview]
Message-ID: <Y7L5nfcAH1aTh8po@kernel.org> (raw)
In-Reply-To: <7c9637711271f50ec2341fb8a7c29585335dab04.1672174189.git.nabijaczleweli@nabijaczleweli.xyz>
Em Tue, Dec 27, 2022 at 09:58:00PM +0100, Ahelenia Ziemiańska escreveu:
> 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 <nabijaczleweli@nabijaczleweli.xyz>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
Thanks, applied to perf/urgent.
- Arnaldo
> ---
> 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')
> --
> 2.30.2
--
- Arnaldo
prev parent reply other threads:[~2023-01-02 15:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-26 19:35 [PATCH] perf tui: don't ignore job control Ahelenia Ziemiańska
2022-12-26 19:50 ` [PATCH 2/1] perf tools: don't include signature in version strings Ahelenia Ziemiańska
2022-12-27 20:29 ` Namhyung Kim
2022-12-27 20:24 ` [PATCH] perf tui: don't ignore job control Namhyung Kim
2022-12-27 20:57 ` [PATCH v2 1/2] " Ahelenia Ziemiańska
2022-12-27 21:21 ` Namhyung Kim
2023-01-02 15:35 ` Arnaldo Carvalho de Melo
2024-01-04 21:23 ` Arnaldo Carvalho de Melo
2024-01-10 16:11 ` Ian Rogers
2022-12-27 20:58 ` [PATCH v2 2/2] perf tools: don't include signature in version strings Ahelenia Ziemiańska
2023-01-02 15:34 ` Arnaldo Carvalho de Melo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y7L5nfcAH1aTh8po@kernel.org \
--to=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=nabijaczleweli@nabijaczleweli.xyz \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).