[PATCH] Makefile.in: Only set git version if .git directory exists

Toke Høiland-Jørgensen toke at toke.dk
Thu May 3 11:56:02 CEST 2018


Jan Maria Matejka <jan.matejka at nic.cz> writes:

> Hi!
>
> On 05/02/2018 06:43 PM, Toke Høiland-Jørgensen wrote:
>> If Bird is compiled from a release tarball, but there is a git repository
>> somewhere in a parent directory, the Makefile git version logic will pick
>> up that version and use it as the Bird version, which is obviously not
>> desirable> 
>> For instance, on OpenWrt this results in something like this:
>> 
>> BIRD version reboot-6789-g4e9ce23aa5
>
> Thank you for reporting the bug and sending the patch! Anyway, it
> failed with my config as I use multiple worktree configuration (where
> .git is only a file containing the real gitdir path). I also fixed it
> for build outside the workdir.

Ah, right, didn't think of more esoteric git configs. Anyway, can
confirm that you version also works for OpenWrt builds. Thanks! :)

-Toke



More information about the Bird-users mailing list