Try and make the builds a little more tarball friendly.

UtilFunction · Jul 22, 2017 · f678544 · f678544
1 parent 568c77e
commit f678544
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/images/buildUEFI64 b/images/buildUEFI64
@@ -3,7 +3,7 @@ set -x
 # Build a custom UEFI linux based PBA image
 ## define releases for tools
 . conf
-VERSIONINFO=`git describe --dirty` || VERSIONINFO=downloaded
+VERSIONINFO=`git describe --dirty`  || VERSIONINFO=tarball
 BUILDTYPE=UEFI64
 BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img
 
@@ -34,4 +34,4 @@ sudo cp ../scratch/buildroot/64bit/images/rootfs.cpio.xz image/EFI/boot/
 sudo cp ../buildroot/syslinux.cfg image/EFI/boot/
 sudo umount image
 sudo losetup -d $LOOPDEV
-gzip ${BUILDIMG}
+gzip ${BUILDIMG}
diff --git a/images/buildbios b/images/buildbios
@@ -3,7 +3,7 @@ set -x
 # Build a custom bootable image for BIOS machines
 ## define releases for tools
 . conf
-VERSIONINFO=`git describe --dirty`
+VERSIONINFO=`git describe --dirty`  || VERSIONINFO=tarball
 BUILDTYPE=BIOS32
 BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img
 

diff --git a/images/legacypba b/images/legacypba
@@ -3,8 +3,7 @@ set -x
 # Build the bios PBA
 ## define releases for tools
 . conf
-
-VERSIONINFO=`git describe --dirty`
+VERSIONINFO=`git describe --dirty`  || VERSIONINFO=tarball
 SYSLINUX_PBA=../../../syslinux
 BUILDTYPE=biospba
 BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img

diff --git a/linux/GitVersion.sh b/linux/GitVersion.sh
@@ -1,3 +1,9 @@
 #!/bin/bash 
-GITVER=`git describe --dirty`
-echo "#define GIT_VERSION " \"$GITVER\"
+set -x
+GIT=`which git`
+if [ "x"${GIT} == "x" ]; then
+	echo "#define GIT_VERSION \"tarball\""
+else
+	GITVER=`git describe --dirty`
+	echo "#define GIT_VERSION " \"$GITVER\"
+fi