jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-27 20:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1783 from Kwiboo/reduce-device-complexity-8.2

Browse Source 
LE 8.2: reduce $DEVICE complexity
This commit is contained in:
Christian Hewitt 2017-08-07 21:48:32 +04:00 committed by GitHub
commit f6fade45af
3 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/path
View File

@ -19,16 +19,9 @@ set -e
HOST_NAME=`$LOCAL_CC -dumpmachine` HOST_NAME=`$LOCAL_CC -dumpmachine`
TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI} TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
if [ -n "$DEVICE" ]; then BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$LIBREELEC_VERSION
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION if [ "$LIBREELEC_VERSION" = "devel" ] ; then
if [ "$LIBREELEC_VERSION" = "devel" ] ; then BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$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
if [ "$LIBREELEC_VERSION" = "devel" ] ; then
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
fi
fi fi
if [ -n "$BUILD_SUFFIX" ]; then if [ -n "$BUILD_SUFFIX" ]; then

12
scripts/create_addon
View File

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

25
scripts/image
View File

@ -67,19 +67,12 @@ if [ -n "$CUSTOM_GIT_HASH" ]; then
GIT_HASH="$CUSTOM_GIT_HASH" GIT_HASH="$CUSTOM_GIT_HASH"
fi fi
if [ -z "$DEVICE" ]; then LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH"
TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION" TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION"
else
TARGET_VERSION="$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION"
fi
IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
if [ "$DEVEL_VERSION" = "devel" ] ; then if [ "$DEVEL_VERSION" = "devel" ] ; then
if [ -z "$DEVICE" ]; then IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
else
IMAGE_NAME="$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
fi
fi fi
if [ "$PROJECT" == "imx6" -a -n "$SYSTEM" ]; then 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 "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release
echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $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 "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
if [ -z "$DEVICE" ]; then echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release
echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_ARCH=\"$LIBREELEC_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 echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release
# create /etc/issue # create /etc/issue
@ -153,7 +141,7 @@ echo "$GREETING1" >> $INSTALL/etc/issue
echo "$GREETING2" >> $INSTALL/etc/issue echo "$GREETING2" >> $INSTALL/etc/issue
echo "$GREETING3" >> $INSTALL/etc/issue echo "$GREETING3" >> $INSTALL/etc/issue
echo "$GREETING4" >> $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 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" \ TOOLCHAIN="$TOOLCHAIN" \
PROJECT_DIR="$PROJECT_DIR" \ PROJECT_DIR="$PROJECT_DIR" \
PROJECT="$PROJECT" \ PROJECT="$PROJECT" \
DEVICE="$DEVICE" \
DISTRO="$DISTRO" \ DISTRO="$DISTRO" \
TARGET_IMG="$TARGET_IMG" \ TARGET_IMG="$TARGET_IMG" \
IMAGE_NAME="$IMAGE_NAME" \ IMAGE_NAME="$IMAGE_NAME" \