From d2b7dd21522055e0fec7b12db9d065639cec92c4 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 15 Feb 2017 23:26:25 -0800 Subject: [PATCH 1/2] config/path: use $DEVICE.$TARGET_ARCH --- config/path | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/path b/config/path index ea126bc2ce4..7b05377178e 100644 --- a/config/path +++ b/config/path @@ -20,9 +20,9 @@ HOST_NAME=`$LOCAL_CC -dumpmachine` TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI} if [ -n "$DEVICE" ]; then - BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION + BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION if [ "$LIBREELEC_VERSION" = "devel" ] ; then - BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION + BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION fi else BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION From 44dc5c96470c9277274fafa7cfdaa421e4cd52aa Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 15 Feb 2017 23:26:47 -0800 Subject: [PATCH 2/2] scripts/image: use $DEVICE.$TARGET_ARCH --- scripts/image | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/image b/scripts/image index c0f96fb74a5..cff18addb1e 100755 --- a/scripts/image +++ b/scripts/image @@ -70,7 +70,7 @@ fi if [ -z "$DEVICE" ]; then TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION" else - TARGET_VERSION="$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION" + TARGET_VERSION="$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION" fi IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" @@ -78,7 +78,7 @@ if [ "$DEVEL_VERSION" = "devel" ] ; then if [ -z "$DEVICE" ]; then IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" else - IMAGE_NAME="$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" + IMAGE_NAME="$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" fi fi @@ -138,8 +138,13 @@ echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD) - Version: $LIBREELEC_VERS 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 -echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release -echo -e "LIBREELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $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 "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release # create /etc/issue