From d55e191cdaf1e6e97e9b6185530d1a56e9e61e5f Mon Sep 17 00:00:00 2001
From: sky42 <sky2t3t7@gmail.com>
Date: Mon, 17 Jun 2019 04:52:04 +0000
Subject: [PATCH 1/2] scripts: image: BUILDER_NAME in image filename

---
 scripts/image | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/image b/scripts/image
index f2a8740100..0fbdd55f70 100755
--- a/scripts/image
+++ b/scripts/image
@@ -95,13 +95,21 @@ if [ -n "${CUSTOM_VERSION}" ]; then
 fi
 
 LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
-TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
+if [ "${LIBREELEC_BUILD}" = "official" ]; then
+  TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
+else
+  TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${LIBREELEC_VERSION}"
+fi
 
 if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
   IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
 else
   if [ "${DEVEL_VERSION}" = "devel" ]; then
-    IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
+    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
   else
     IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
   fi

From 3f77c14b606cbb3d1f03fbb19905e41b9f3dce3a Mon Sep 17 00:00:00 2001
From: sky42 <sky2t3t7@gmail.com>
Date: Sun, 8 Sep 2019 20:27:05 +0200
Subject: [PATCH 2/2] Update scripts/image

Co-Authored-By: MilhouseVH <MilhouseVH@users.noreply.github.com>
---
 scripts/image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/image b/scripts/image
index 0fbdd55f70..7874846314 100755
--- a/scripts/image
+++ b/scripts/image
@@ -95,7 +95,7 @@ if [ -n "${CUSTOM_VERSION}" ]; then
 fi
 
 LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
-if [ "${LIBREELEC_BUILD}" = "official" ]; then
+if [ "${OFFICIAL}" = "yes" ]; then
   TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
 else
   TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_BUILD}-${LIBREELEC_VERSION}"