Created
April 22, 2018 16:35
-
-
Save MilhouseVH/a6c80d7358f9adc428cb5e268bab9d21 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/scripts/image b/scripts/image | |
old mode 100755 | |
new mode 100644 | |
index 8859eca..9f01d36 | |
--- a/scripts/image | |
+++ b/scripts/image | |
@@ -38,18 +38,21 @@ $SCRIPTS/build kmod:host | |
$SCRIPTS/build mtools:host | |
$SCRIPTS/build populatefs:host | |
-BUILD_DATE=`date +%Y%m%d%H%M%S` | |
- | |
-GIT_HASH=$(git rev-parse HEAD) | |
+if [ -n "$CUSTOM_GIT_HASH" ]; then | |
+ GIT_HASH="$CUSTOM_GIT_HASH" | |
+else | |
+ GIT_HASH=$(git rev-parse HEAD) | |
+fi | |
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_ABBREV=$(git log -1 --pretty=format:%h) | |
DEVEL_VERSION=$LIBREELEC_VERSION | |
- LIBREELEC_VERSION=$LIBREELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV | |
+ GIT_ABBREV=${GIT_HASH:0:7} | |
+ case "$BUILD_PERIODIC" in | |
+ nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-$GIT_ABBREV;; | |
+ daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-$GIT_ABBREV;; | |
+ weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-$GIT_ABBREV;; | |
+ *) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-$GIT_ABBREV;; | |
+ esac | |
echo "$LIBREELEC_VERSION" > $BUILD/BUILD_FILENAME | |
fi | |
@@ -66,10 +69,6 @@ if [ -n "$CUSTOM_VERSION" ]; then | |
LIBREELEC_VERSION="$CUSTOM_VERSION" | |
fi | |
-if [ -n "$CUSTOM_GIT_HASH" ]; then | |
- GIT_HASH="$CUSTOM_GIT_HASH" | |
-fi | |
- | |
LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH" | |
TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION" | |
IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment