From dc23dc5a81c30ae9e20a72691bf964f1a2f6547b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 25 Jun 2012 15:09:34 +0200 Subject: [PATCH] include auto-generated GIT_REVISION into the DFU and firmware builds At the moment it is only shown on the serial console, though. --- firmware/osmosdr-project/Makefile | 4 + firmware/osmosdr-project/main.c | 3 +- firmware/usb-dfu-project/Makefile | 4 + firmware/usb-dfu-project/main.c | 5 +- git-version-gen | 151 ++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 5 deletions(-) create mode 100755 git-version-gen diff --git a/firmware/osmosdr-project/Makefile b/firmware/osmosdr-project/Makefile index cd515d9..34adb0d 100644 --- a/firmware/osmosdr-project/Makefile +++ b/firmware/osmosdr-project/Makefile @@ -69,6 +69,10 @@ include $(AT91LIB)/boards/$(BOARD)/board.mak BIN = bin OBJ = obj +GIT_REVISION := $(shell ../../git-version-gen ../../.tarball_version) +ASFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\" +CFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\" + #------------------------------------------------------------------------------- # Tools #------------------------------------------------------------------------------- diff --git a/firmware/osmosdr-project/main.c b/firmware/osmosdr-project/main.c index c1e357c..e117c8b 100644 --- a/firmware/osmosdr-project/main.c +++ b/firmware/osmosdr-project/main.c @@ -424,8 +424,7 @@ int main(void) TWI_ConfigureMaster(AT91C_BASE_TWI0, TWI_CLOCK, SSC_MCK); TWID_Initialize(&twid, AT91C_BASE_TWI0); - printf("-- osmo-sdr project %s --\n\r", SOFTPACK_VERSION); - printf("-- %s\n\r", BOARD_NAME); + printf("-- OsmoSDR firmware (" BOARD_NAME ") " GIT_REVISION " --\n\r"); printf("-- Compiled: %s %s --\n\r", __DATE__, __TIME__); req_ctx_init(); diff --git a/firmware/usb-dfu-project/Makefile b/firmware/usb-dfu-project/Makefile index d41be19..174105a 100644 --- a/firmware/usb-dfu-project/Makefile +++ b/firmware/usb-dfu-project/Makefile @@ -69,6 +69,10 @@ include $(AT91LIB)/boards/$(BOARD)/board.mak BIN = bin OBJ = obj +GIT_REVISION := $(shell ../../git-version-gen ../../.tarball_version) +ASFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\" +CFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\" + #------------------------------------------------------------------------------- # Tools #------------------------------------------------------------------------------- diff --git a/firmware/usb-dfu-project/main.c b/firmware/usb-dfu-project/main.c index 5e01092..592e8fd 100644 --- a/firmware/usb-dfu-project/main.c +++ b/firmware/usb-dfu-project/main.c @@ -446,9 +446,8 @@ int main(void) TRACE_CONFIGURE(DBGU_STANDARD, 115200, BOARD_MCK); -// printf("-- USB DFU Test %s --\n\r", SOFTPACK_VERSION); - printf("-- %s\n\r", BOARD_NAME); -// printf("-- Compiled: %s %s --\n\r", __DATE__, __TIME__); + printf("-- Osmocom USB DFU (" BOARD_NAME ") " GIT_REVISION " --\n\r"); + printf("-- Compiled: %s %s --\n\r", __DATE__, __TIME__); rst_type = (RSTC_GetStatus() >> 8) & 0x7; //printf("-- Reset type: %s --\n\r", rst_type_strs[rst_type]); diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: