'git describe' shows:
v2009.12.0-178-gdc882c3
I.e. git doesn't find the more recent v2010.06.0 unannotated tag. The top-level
Makefile then takes the '-178-gdc882c3' part and attaches it to '2010.06.0'
(the current version string), making the output of the 'version' command:
barebox 2010.06.0-00178-gcc827a1 (Jul 1 2010 - 09:02:45)
which is plain wrong. Add the --tags option to make 'git describe' look for
unannotated tags as well.
Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
---
scripts/setlocalversion | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 83b7512..4f9dafe 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,7 +12,7 @@ cd "${1:-.}" || usage
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
# Do we have an untagged version?
if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
- if tag=`git describe 2>/dev/null`; then
+ if tag=`git describe --tags 2>/dev/null`; then
echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
fi
fi
--
1.7.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
