Skip to content

Commit f678544

Browse files
committed
Try and make the builds a little more tarball friendly.
1 parent 568c77e commit f678544

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

images/buildUEFI64

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -x
33
# Build a custom UEFI linux based PBA image
44
## define releases for tools
55
. conf
6-
VERSIONINFO=`git describe --dirty` || VERSIONINFO=downloaded
6+
VERSIONINFO=`git describe --dirty` || VERSIONINFO=tarball
77
BUILDTYPE=UEFI64
88
BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img
99

@@ -34,4 +34,4 @@ sudo cp ../scratch/buildroot/64bit/images/rootfs.cpio.xz image/EFI/boot/
3434
sudo cp ../buildroot/syslinux.cfg image/EFI/boot/
3535
sudo umount image
3636
sudo losetup -d $LOOPDEV
37-
gzip ${BUILDIMG}
37+
gzip ${BUILDIMG}

images/buildbios

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -x
33
# Build a custom bootable image for BIOS machines
44
## define releases for tools
55
. conf
6-
VERSIONINFO=`git describe --dirty`
6+
VERSIONINFO=`git describe --dirty` || VERSIONINFO=tarball
77
BUILDTYPE=BIOS32
88
BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img
99

images/legacypba

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ set -x
33
# Build the bios PBA
44
## define releases for tools
55
. conf
6-
7-
VERSIONINFO=`git describe --dirty`
6+
VERSIONINFO=`git describe --dirty` || VERSIONINFO=tarball
87
SYSLINUX_PBA=../../../syslinux
98
BUILDTYPE=biospba
109
BUILDIMG=${BUILDTYPE}-${VERSIONINFO}.img

linux/GitVersion.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
#!/bin/bash
2-
GITVER=`git describe --dirty`
3-
echo "#define GIT_VERSION " \"$GITVER\"
2+
set -x
3+
GIT=`which git`
4+
if [ "x"${GIT} == "x" ]; then
5+
echo "#define GIT_VERSION \"tarball\""
6+
else
7+
GITVER=`git describe --dirty`
8+
echo "#define GIT_VERSION " \"$GITVER\"
9+
fi

0 commit comments

Comments
 (0)