Merge pull request #87 from MilhouseVH/githash

Thanks :)
This commit is contained in:
Christian Hewitt 2016-04-03 12:06:15 +04:00
commit 42265e9b72

View File

@ -33,12 +33,13 @@ $SCRIPTS/build populatefs:host
BUILD_DATE=`date +%Y%m%d%H%M%S`
if [ "$LIBREELEC_VERSION" = devel ]; then
GIT_HASH=$(git rev-parse HEAD)
if [ "$LIBREELEC_VERSION" = "devel" ]; then
if ! GIT_BUILD=$(git rev-list --count HEAD 2>/dev/null)
then
GIT_BUILD=$(git rev-list HEAD | wc -l)
fi
GIT_HASH=$(git rev-parse HEAD)
GIT_ABBREV=$(git log -1 --pretty=format:%h)
DEVEL_VERSION=$LIBREELEC_VERSION
LIBREELEC_VERSION=$LIBREELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV
@ -100,9 +101,7 @@ fi
echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) - Version: $LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release
echo -e "HOME_URL=\"http://www.libreelec.tv\"" >> $INSTALL/etc/os-release
echo -e "BUG_REPORT_URL=\"https://github.com/LibreELEC/LibreELEC.tv\"" >> $INSTALL/etc/os-release
if [ -n "$GIT_HASH" ]; then
echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
fi
echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
echo -e "LIBREELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
if [ "$OFFICIAL" = "yes" ]; then
@ -118,7 +117,7 @@ fi
echo "$GREETING3" >> $INSTALL/etc/issue
echo "$GREETING4" >> $INSTALL/etc/issue
echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) Version: $LIBREELEC_VERSION" >> $INSTALL/etc/issue
if [ -n "$GIT_HASH" ]; then
if [ "$DEVEL_VERSION" = "devel" ] ; then
echo "$DISTRONAME git: $GIT_HASH" >> $INSTALL/etc/issue
fi