From b32beecdf2506451b4fecd7e729514925009acea Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 11 Jul 2017 21:19:07 +0200
Subject: [PATCH 1/3] config/path: reduce $DEVICE complexity

(cherry picked from commit 388b357e043651f0d20747623a179685c895bc0e)
---
 config/path | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/config/path b/config/path
index 7e81eb820b..62d8c39401 100644
--- a/config/path
+++ b/config/path
@@ -19,16 +19,9 @@ set -e
 HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
 
-if [ -n "$DEVICE" ]; then
-  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
-else
-  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
+BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$LIBREELEC_VERSION
+if [ "$LIBREELEC_VERSION" = "devel" ] ; then
+  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
 fi
 
 if [ -n "$BUILD_SUFFIX" ]; then

From bd3c329acb33e88699a7cce3edc23051f3a750a9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 11 Jul 2017 21:19:07 +0200
Subject: [PATCH 2/3] scripts/image: reduce $DEVICE complexity

(cherry picked from commit 46b69d29bfb80a6b50876c25e60aaa18318c488e)
---
 scripts/image | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/scripts/image b/scripts/image
index c557f21c1a..2d079a1611 100755
--- a/scripts/image
+++ b/scripts/image
@@ -67,19 +67,12 @@ if [ -n "$CUSTOM_GIT_HASH" ]; then
   GIT_HASH="$CUSTOM_GIT_HASH"
 fi
 
-if [ -z "$DEVICE" ]; then
-  TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION"
-else
-  TARGET_VERSION="$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION"
-fi
+LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH"
+TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION"
 IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 
 if [ "$DEVEL_VERSION" = "devel" ] ; then
-  if [ -z "$DEVICE" ]; then
-    IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
-  else
-    IMAGE_NAME="$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
-  fi
+  IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
 fi
 
 if [ "$PROJECT" == "imx6" -a -n "$SYSTEM" ]; then
@@ -138,13 +131,8 @@ echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >>
 echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release
 echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release
 echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
-if [ -z "$DEVICE" ]; then
-  echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
-  echo -e "LIBREELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
-else
-  echo -e "OPENELEC_ARCH=\"$DEVICE.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
-  echo -e "LIBREELEC_ARCH=\"$DEVICE.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
-fi
+echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
+echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
 echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release
 
 # create /etc/issue
@@ -153,7 +141,7 @@ echo "$GREETING1" >> $INSTALL/etc/issue
 echo "$GREETING2" >> $INSTALL/etc/issue
 echo "$GREETING3" >> $INSTALL/etc/issue
 echo "$GREETING4" >> $INSTALL/etc/issue
-echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($PROJECT $TARGET_ARCH)" >> $INSTALL/etc/issue
+echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($LIBREELEC_ARCH)" >> $INSTALL/etc/issue
 
 ln -sf /etc/issue $INSTALL/etc/motd
 
@@ -351,6 +339,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       TOOLCHAIN="$TOOLCHAIN" \
       PROJECT_DIR="$PROJECT_DIR" \
       PROJECT="$PROJECT" \
+      DEVICE="$DEVICE" \
       DISTRO="$DISTRO" \
       TARGET_IMG="$TARGET_IMG" \
       IMAGE_NAME="$IMAGE_NAME" \

From ada645e251cc1ee8db7ec40723a05859e74ceece Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 11 Jul 2017 21:19:07 +0200
Subject: [PATCH 3/3] scripts/create_addon: reduce $DEVICE complexity

(cherry picked from commit fbc4fd4e0beea5c2443f34fb69d7eeb1b339990d)
---
 scripts/create_addon | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/create_addon b/scripts/create_addon
index 956c4e2cd8..dd36241f0a 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -121,11 +121,7 @@ pack_addon() {
   debug_strip $ADDON_BUILD/$PKG_ADDON_ID
 
   if [ "$2" != "-test" ] ; then
-    if [ -n "${DEVICE}" ]; then
-      ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$DEVICE/$TARGET_ARCH/$PKG_ADDON_ID"
-    else
-      ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
-    fi
+    ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH/$PKG_ADDON_ID"
     if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then
       echo "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***"
       return 0
@@ -168,11 +164,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
 
   $SCRIPTS/build $@
 
-  if [ -n "${DEVICE}" ]; then
-    printf  "%${BUILD_INDENT}c CREATE ADDON  ($DEVICE/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
-  else
-    printf  "%${BUILD_INDENT}c CREATE ADDON  ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
-  fi
+  printf  "%${BUILD_INDENT}c CREATE ADDON  (${DEVICE:-$PROJECT}/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
   export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
   rm -rf $ADDON_BUILD