Revision is now ok when we are in a branch.
This commit is contained in:
parent
9baf34fd57
commit
466e5b2f53
|
@ -32,7 +32,7 @@ CDBOOT=${IMGROOT}/usr/standalone/i386/cdboot
|
||||||
EFIROOT=${SRCROOT}/CloverV2/EFI
|
EFIROOT=${SRCROOT}/CloverV2/EFI
|
||||||
BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin
|
BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin
|
||||||
|
|
||||||
REVISION=$(git describe --tags $(git rev-list --tags --max-count=1))
|
REVISION=$(git describe --tags)
|
||||||
PRODUCT=Clover-${REVISION}
|
PRODUCT=Clover-${REVISION}
|
||||||
CDLABEL=${PRODUCT}-X64
|
CDLABEL=${PRODUCT}-X64
|
||||||
ISOIMAGE=${SYMROOT}/${CDLABEL}.iso
|
ISOIMAGE=${SYMROOT}/${CDLABEL}.iso
|
||||||
|
|
|
@ -31,7 +31,7 @@ done
|
||||||
# Go to the script directory to create the package
|
# Go to the script directory to create the package
|
||||||
cd "$(dirname $0)"
|
cd "$(dirname $0)"
|
||||||
|
|
||||||
revision=$(git describe --tags $(git rev-list --tags --max-count=1))
|
revision=$(git describe --tags)
|
||||||
|
|
||||||
SRCROOT="${PWD}"
|
SRCROOT="${PWD}"
|
||||||
SYMROOT="${SRCROOT}"/sym
|
SYMROOT="${SRCROOT}"/sym
|
||||||
|
|
2
buildme
2
buildme
|
@ -262,7 +262,7 @@ if [[ -d .git ]]; then
|
||||||
lsha1=$(git rev-parse --short HEAD)
|
lsha1=$(git rev-parse --short HEAD)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "buildme, Clover r$(git describe --tags $(git rev-list --tags --max-count=1)) (SHA: $lsha1)"
|
echo "buildme, Clover r$(git describe --tags) (SHA: $lsha1)"
|
||||||
echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme XCODE8')"
|
echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme XCODE8')"
|
||||||
echo
|
echo
|
||||||
PS3='Please enter your choice: '
|
PS3='Please enter your choice: '
|
||||||
|
|
Loading…
Reference in New Issue