From 9a97f1b8ae4461268cfddf8dfa9c65ea67c4e563 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 13 Sep 2019 17:02:42 +0100
Subject: [PATCH] Revert "scripts: image: BUILDER_NAME in image filename"

This reverts commit d55e191cdaf1e6e97e9b6185530d1a56e9e61e5f.
---
 scripts/image | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/image b/scripts/image
index 0fbdd55f70..f2a8740100 100755
--- a/scripts/image
+++ b/scripts/image
@@ -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