From b32beecdf2506451b4fecd7e729514925009acea Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Tue, 11 Jul 2017 21:19:07 +0200 Subject: [PATCH] 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