jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1711 from Kwiboo/device-support-8.2

Browse Source 
LE8.2: Add missing support for $DEVICE from master
This commit is contained in:
Christian Hewitt 2017-07-09 14:50:41 +04:00 committed by GitHub
commit b48ff9491c
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/functions
View File

@ -329,7 +329,7 @@ dashes="==========================="
linux_config_dir="$PROJECT_DIR/$PROJECT/linux" linux_config_dir="$PROJECT_DIR/$PROJECT/linux"
fi fi
if [ ! -f $linux_config_dir/linux.$TARGET_ARCH.conf ] && if [ ! -e $linux_config_dir/linux.$TARGET_ARCH.conf ] &&
! ls $linux_config_dir/*/linux.$TARGET_ARCH.conf &>/dev/null; then ! ls $linux_config_dir/*/linux.$TARGET_ARCH.conf &>/dev/null; then
check_arch="$check_arch\n $dashes$dashes$dashes" check_arch="$check_arch\n $dashes$dashes$dashes"
check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture" check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"

4
config/path
View File

@ -20,9 +20,9 @@ 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 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 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 fi
else else
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION

12
scripts/create_addon
View File

@ -119,7 +119,11 @@ pack_addon() {
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
if [ "$2" != "-test" ] ; then if [ "$2" != "-test" ] ; then
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID" 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
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
@ -162,7 +166,11 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
$SCRIPTS/build $@ $SCRIPTS/build $@
printf "%${BUILD_INDENT}c CREATE ADDON ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT 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
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

13
scripts/image
View File

@ -70,7 +70,7 @@ fi
if [ -z "$DEVICE" ]; then if [ -z "$DEVICE" ]; then
TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION" TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION"
else else
TARGET_VERSION="$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION" TARGET_VERSION="$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION"
fi fi
IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
@ -78,7 +78,7 @@ if [ "$DEVEL_VERSION" = "devel" ] ; then
if [ -z "$DEVICE" ]; then if [ -z "$DEVICE" ]; then
IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
else else
IMAGE_NAME="$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" IMAGE_NAME="$DISTRONAME-$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION"
fi fi
fi fi
@ -138,8 +138,13 @@ 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
echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release if [ -z "$DEVICE" ]; then
echo -e "LIBREELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $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
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