On 06/01/16 06:41, Fam Zheng wrote:
> v2: Address Eric's comments:
> "echo -n" -> "printf".
> "-unclean" -> "-dirty".
>
> Makefile happened to be in my working set because of the docker test work, so
> I
> went ahead to try this nice feature last evening before going to bed. My
> apologies if we have duplicated work.
>
> Please review, especially please comment on the redundant version string:
>
> $ qemu-img --version
> qemu-img version 2.6.50-v2.6.0-603-g684a494, Copyright (c) 2004-2008 Fabrice
> Bellard
>
>
> Fam Zheng (2):
> Makefile: Add a "FORCE" target
> Makefile: Derive "PKGVERSION" from "git describe" by default
>
> Makefile | 24 ++++++++++++++++++++++--
> linux-user/main.c | 1 +
> qemu-img.c | 1 +
> qmp.c | 1 +
> scripts/create_config | 4 ----
> vl.c | 1 +
> 6 files changed, 26 insertions(+), 6 deletions(-)
>
I only skimmed the git commands in patch #2:
git status --> this verifies if we have git at all, and refreshes the
index if we do, in the same step, so that's good
git describe --> okay
git diff-index --quiet HEAD --> okay
Another advantage of this approach seems to be that it sets the version
at "make", not at "configure", time.
Some comments / questions on the version string:
- What happens if "--with-pkgversion=blah" was passed to ./configure?
Do I see it right that in that case there's no change in behavior?
- I think the following format would look better (stolen from
--with-pkgversion):
2.6.50 (v2.6.0-603-g684a494)
Thanks
Laszlo
