Revert "scripts: image: BUILDER_NAME in image filename"

This reverts commit d55e191cdaf1e6e97e9b6185530d1a56e9e61e5f.
This commit is contained in:
MilhouseVH 2019-09-13 17:02:42 +01:00
parent 6dc483c169
commit 9a97f1b8ae

View File

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