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;
Feedback-ID: ica594744:Fastmail
From:   Will Chandler <wfc@wfchandler.org>
To:     John Garry <john.garry@huawei.com>
Cc:     peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
        mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
        jolsa@kernel.org, namhyung@kernel.org,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf tools: Fix empty version number when building outside of a git repo
Date:   Wed, 28 Sep 2022 13:26:04 -0400
Message-ID: <87A1F5B6-3F60-4988-8BA6-A993E5789C80@wfchandler.org>
In-Reply-To: <c5181877-2998-b952-abe6-26d733ae2aeb@huawei.com>
References: <20220927195228.47304-1-wfc@wfchandler.org>
 <c5181877-2998-b952-abe6-26d733ae2aeb@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On 28 Sep 2022, at 5:21, John Garry wrote:

> This looks ok. But did you consider going back to same flow as pre-7572=
733b8499 to avoid a Makefile check, like:
>
> ---8<----
>
> CID=3D
> TAG=3D
> if test -d ../../.git -o -f ../../.git
> then
> TAG=3D$(MAKEFLAGS=3D make -sC ../.. kernelversion)
> CID=3D$(git log -1 --abbrev=3D12 --pretty=3Dformat:"%h" 2>/dev/null) &&=
 CID=3D"-g$CID"
> elif test -f ../../PERF-VERSION-FILE
> then
> TAG=3D$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g')
> fi
> if test -z "$TAG"
> then
> TAG=3D$(MAKEFLAGS=3D make -sC ../.. kernelversion)
> fi
>
> --->8---
>
> The evaluation for $TAG is not really needed in the first leg since the=
 fallback does the same thing, but just added for clarity.

I think that would be fine as well. I don't have a strong opinion on whic=
h one
is easier to follow.

Looking at this more closely, there is a slight difference between the tw=
o
approaches. In the problem scenario my patch will always use `make kernel=
version`,
while pre-7572733b8499 starts with PERF-VERSION-FILE if available, fallin=
g
back to the Makefile.

With the old approach PERF-VERSION-FILE could be used to manually
override the version, but this is inconsistent with how the version is
generated when building in a git repo. Is this relevant?