jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3823 from MilhouseVH/le10_rev3798

Browse Source 
Revert PR3798
This commit is contained in:
CvH 2019-09-13 18:57:25 +02:00 committed by GitHub
commit 97a8a7cc86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/image
View File

@ -95,21 +95,13 @@ if [ -n "${CUSTOM_VERSION}" ]; then
fi fi
LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}" LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
if [ "${OFFICIAL}" = "yes" ]; then TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
else
TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${LIBREELEC_VERSION}"
fi
if [ -n "${CUSTOM_IMAGE_NAME}" ]; then if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
IMAGE_NAME="${CUSTOM_IMAGE_NAME}" IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
else else
if [ "${DEVEL_VERSION}" = "devel" ]; then if [ "${DEVEL_VERSION}" = "devel" ]; then
if [ -n "${BUILDER_NAME}" ]; then IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${OS_VERSION}-${LIBREELEC_VERSION}"
else
IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
fi
else else
IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}" IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
fi fi