[Sound-open-firmware] [PATCHv2] build: fix version script to use correct version in tarball build

Liam Girdwood liam.r.girdwood at linux.intel.com
Thu Jan 11 15:57:26 CET 2018


make sure the tarball build and worktree build uses the correct version.

Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
 version.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.sh b/version.sh
index 1f57c53..4f25ecd 100755
--- a/version.sh
+++ b/version.sh
@@ -10,8 +10,8 @@ else
 	DIR=$1
 fi
 
-# create git version if we are a git repo
-if [ ! -d $DIR/.git ]; then
+# create git version if we are a git repo or git worktree
+if [ -e $DIR/.git -o -d $DIR/.git ]; then
 #	 version for make dist
 	git describe --abbrev=4 > $DIR/.version
 	git describe --abbrev=4 > $DIR/.tarball-version
@@ -19,7 +19,7 @@ if [ ! -d $DIR/.git ]; then
 	# git commit for IPC
 	echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > $DIR/src/include/version.h
 else
-	echo "#define REEF_TAG 0" > $DIR/src/include/version.h
+	echo "#define REEF_TAG \"0\"" > $DIR/src/include/version.h
 fi
 
 # build counter
-- 
2.14.1



More information about the Sound-open-firmware mailing list