Re: [PATCH] perf: Fix version when building out of tree

[David Ahern <dsahern@gmail.com>]

On 11/7/13, 1:30 AM, Ingo Molnar wrote:
>
> * David Ahern <dsahern@gmail.com> wrote:
>
>> On 11/5/13, 10:36 PM, Ingo Molnar wrote:
>>> I think you could avoid the 'short' complication altogether by doing
>>> something like this:
>>>
>>>> +elif test -f ../../PERF-VERSION-FILE
>>>> +then
>>>> +	TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE)
>>>
>>> That extracts 'TAG' as a true sha1 and makes GVF correct on out of tree
>>> builds as well.
>>
>> Certainly. I was trying to make PERF-VERSION-FILE readable as a
>> standalone file -- a better version descriptor than HEAD file.
>
> Do you mean that instead of:
>
>    comet:~/tip/tools/perf> cat PERF-VERSION-FILE
>    #define PERF_VERSION "3.12.g953bfb"

no. I was thinking instead of
cat PERF-VERSION-FILE
#define PERF_VERSION "3.12.g953bfb"

you have
cat PERF-VERSION-FILE
3.12.g953bfb

But remember this is a new PERF-VERSION-FILE at the top of tree -- just 
like the HEAD file that contains the top commit id. Both are generated 
as part of the make perf-tar-src-pkg to keep track of the origin of the 
source. The new file becomes the basis of $(OUTPUT)PERF-VERSION-FILE.

> we should put a plain version into it? (the 'short' form you introduced
> earlier)
>
> And then this:
>
>    Makefile.perf:  $(QUIET_CC)$(CC) -include $(OUTPUT)PERF-VERSION-FILE \
>
> Could be replaced with:
>
>    Makefile.perf:  $(QUIET_CC)$(CC) -D $(shell cat $(OUTPUT)PERF-VERSION-FILE) \
>
> or so?

something like that could be done too.

David