diff --git a/CHANGELOG b/CHANGELOG index 3dfe1cf988..3b125f3248 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,13 @@ -OpenELEC CHANGELOG +LibreELEC CHANGELOG ================== To view recent changes/commits to the project (master branch) please visit: -https://github.com/OpenELEC/OpenELEC.tv/commits/master +https://github.com/LibreELEC/LibreELEC.tv/commits/master To compare commits between versions use a formatted URL like: -https://github.com/OpenELEC/OpenELEC.tv/compare/3.2.3...3.2.4 +https://github.com/LibreELEC/LibreELEC.tv/compare/3.2.3...3.2.4 If you have questions on differences between releases please ask them in the -OpenELEC website forums or IRC support channel. +LibreELEC website forums or IRC support channel. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 573c43fca2..c11bda6094 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,20 +1,20 @@ -### Questions about OpenELEC? +### Questions about LibreELEC? -To get your questions answered, please ask in the OpenELEC [Forum], on IRC: -\#openelec on freenode.net, or [webchat]. +To get your questions answered, please ask in the LibreELEC [Forum], on IRC: +\#libreelec on freenode.net, or [webchat]. Do not open an issue. ### Issue Reports **BEFORE you report a bug make sure you got the latest testing version of -OpenELEC. Your bug might be already fixed.** +LibreELEC. Your bug might be already fixed.** -If you are at all unsure whether it's a bug in OpenELEC or a problem with -something else, post in the OpenELEC [Forum] instead. If it turns out that it is +If you are at all unsure whether it's a bug in LibreELEC or a problem with +something else, post in the LibreELEC [Forum] instead. If it turns out that it is a bug, an issue can always be opened later. -If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue] +If you are sure that it's a bug in LibreELEC and you have not found a [similar issue], open a new [issue] and try to answer the following questions: - What did you do? - What did you expect to happen? @@ -23,21 +23,21 @@ and try to answer the following questions: **It is also importent to provide logs for debugging. A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.** -Make sure to specify which version of OpenELEC you are using. -- OpenELEC version -- OpenELEC build -- OpenELEC arch +Make sure to specify which version of LibreELEC you are using. +- LibreELEC version +- LibreELEC build +- LibreELEC arch Please don't paste log messages in the issue reports or issue comments - use [sprunge.us](http://sprunge.us) instead. Feature requests are great, but they usually end up lying around the issue tracker indefinitely. Sending a pull request is a much better way of getting a -particular feature into OpenELEC. +particular feature into LibreELEC. Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver, we have no manpower to support a non-mainlined kernel driver for your hardware. -However, OpenELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware +However, LibreELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware is supported in mainline kernel, feel free to send us a Pull Request to enable it in our kernel defconfigs. We are always happy to support known-working hardware. @@ -66,11 +66,11 @@ Please follow this process; it's the best way to get your work included in the p ```bash # clone your fork of the repo into the current directory in terminal - git clone git@github.com:/OpenELEC.tv.git + git clone git@github.com:/LibreELEC.tv.git # navigate to the newly cloned directory - cd OpenELEC.tv + cd LibreELEC.tv # assign the original repo to a remote called "upstream" - git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git + git remote add upstream https://github.com/Libre/LibreELEC.tv.git ``` - If you cloned a while ago, get the latest changes from upstream: @@ -104,8 +104,8 @@ Please follow this process; it's the best way to get your work included in the p - [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a clear title and description. -[Forum]: http://openelec.tv/forum -[issue]: https://github.com/OpenELEC/OpenELEC.tv/issues -[webchat]: http://openelec.tv/support/chat -[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs -[similar issue]: https://github.com/OpenELEC/OpenELEC.tv/search?&ref=cmdform&type=Issues +[Forum]: http://libreelec.tv/forum +[issue]: https://github.com/LibreELEC/LibreELEC.tv/issues +[webchat]: http://libreelec.tv/support/chat +[logfiles]: http://wiki.libreelec.tv/index.php?title=LibreELEC_FAQ#Support_Logs +[similar issue]: https://github.com/LibreELEC/LibreELEC.tv/search?&ref=cmdform&type=Issues diff --git a/README.md b/README.md index 5dbd76c1a5..eab075d305 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[OpenELEC](http://www.openelec.tv) +[LibreELEC](http://www.libreelec.tv) -# OpenELEC - Open Embedded Linux Entertainment Center +# LibreELEC - Libre Embedded Linux Entertainment Center -OpenELEC runs [Kodi](http://kodi.tv), an award-winning free and open source (GPL) software media +LibreELEC runs [Kodi](http://kodi.tv), an award-winning free and open source (GPL) software media player and entertainment hub for digital media. For more info see http://kodi.tv . The base system has been designed and built from the ground up to be as efficient as possible – consuming only tiny disk and memory footprints and @@ -10,26 +10,26 @@ providing cutting edge hardware support to deliver a set-top box experience. **Source code** -* https://github.com/OpenELEC/OpenELEC.tv +* https://github.com/LibreELEC/LibreELEC.tv **Installation** -* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install. +* Please read the instructions in our wiki (http://wiki.libreelec.tv/index.php?title=Installation) on how to install. **License** -* OpenELEC is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). Please refer to the "licenses" folder and +* LibreELEC is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). Please refer to the "licenses" folder and source code for clarification on upstream licensing. **Copyright** -* Since OpenELEC includes code from many up stream projects it includes many - copyright owners. OpenELEC makes NO claim of copyright on any upstream code. - However all OpenELEC authored code is copyright openelec.tv. +* Since LibreELEC includes code from many up stream projects it includes many + copyright owners. LibreELEC makes NO claim of copyright on any upstream code. + However all LibreELEC authored code is copyright libreelec.tv. For a complete copyright list checkout the source code to examine the headers. - Unless expressly stated otherwise all code submitted DIRECTLY to the OpenELEC + Unless expressly stated otherwise all code submitted DIRECTLY to the LibreELEC project (in any form) is licensed under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html) and the Copyright is donated to - openelec.tv. + libreelec.tv. This allows the project to stay manageable in the long term by giving us the freedom to maintain the code as part of the whole without the management overhead of preserving contact with every submitter ever e.g. move to GPLv3. @@ -55,8 +55,8 @@ providing cutting edge hardware support to deliver a set-top box experience. **Notes** -* SSH login details are user: “root” password: “openelec”. - SSH allows command line access to your openelec.tv machine for configuration +* SSH login details are user: “root” password: “libreelec”. + SSH allows command line access to your libreelec.tv machine for configuration and file transfer. Linux/Mac clients can natively use SSH, while Windows users might want to try PuTTY for their terminal access. * $HOME is mounted on /storage (the second ext4 partition on the drive). @@ -64,7 +64,7 @@ providing cutting edge hardware support to deliver a set-top box experience. read-only with the exception of /var (containing runtime configuration data). * Manual update/downgrade procedure is as follows: Copy the snapshot (.tar) to the 'Update' network share (or /storage/.update) on - your openelec machine. Your system will automatically upgrade during the + your libreelec machine. Your system will automatically upgrade during the next reboot. * Automatic mounting of filesystems is supported. Devices such as USB Flash sticks can be plugged into a running machine and will be mounted to /media, @@ -74,7 +74,7 @@ providing cutting edge hardware support to deliver a set-top box experience. **Questions/Support** -* Forums on [http://openelec.tv](http://openelec.tv) -* IRC chatroom **#openelec** on Freenode +* Forums on [http://libreelec.tv](http://libreelec.tv) +* IRC chatroom **#libreelec** on Freenode -**Happy OpenELEC'ing** +**Happy LibreELEC'ing** diff --git a/config/addon/xbmc.python.module.xml b/config/addon/xbmc.python.module.xml index bf92c7d1c2..9fb497c03c 100644 --- a/config/addon/xbmc.python.module.xml +++ b/config/addon/xbmc.python.module.xml @@ -4,7 +4,7 @@ version="@ADDON_VERSION@" provider-name="@PROVIDER_NAME@"> - + @REQUIRES@ diff --git a/config/addon/xbmc.python.script.xml b/config/addon/xbmc.python.script.xml index 1e91c01f80..132e36d887 100644 --- a/config/addon/xbmc.python.script.xml +++ b/config/addon/xbmc.python.script.xml @@ -4,7 +4,7 @@ version="@ADDON_VERSION@" provider-name="@PROVIDER_NAME@"> - + @REQUIRES@ diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml index 73dc0db2d2..7e706f6af4 100644 --- a/config/addon/xbmc.service.xml +++ b/config/addon/xbmc.service.xml @@ -4,7 +4,7 @@ version="@ADDON_VERSION@" provider-name="@PROVIDER_NAME@"> - + @REQUIRES@ diff --git a/config/functions b/config/functions index 3449d58590..27b8685e4e 100644 --- a/config/functions +++ b/config/functions @@ -60,10 +60,10 @@ setup_toolchain() { } kernel_path() { - if [ -e $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk ]; then - . $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk - elif [ -e $HOME/.openelec/packages/linux/package.mk ]; then - . $HOME/.openelec/packages/linux/package.mk + if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then + . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk + elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then + . $HOME/.libreelec/packages/linux/package.mk elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then . $ROOT/projects/$PROJECT/packages/linux/package.mk else @@ -74,10 +74,10 @@ kernel_path() { } kernel_version() { - if [ -e $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk ]; then - . $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk - elif [ -e $HOME/.openelec/packages/linux/package.mk ]; then - . $HOME/.openelec/packages/linux/package.mk + if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then + . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk + elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then + . $HOME/.libreelec/packages/linux/package.mk elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then . $ROOT/projects/$PROJECT/packages/linux/package.mk else @@ -95,11 +95,11 @@ get_module_dir() { # get package's build dir get_build_dir() { if [ ! -z $1 ] ; then - local _PKG_DIR=$(find $HOME/.openelec/projects/$PROJECT/packages -name $1 2>/dev/null) + local _PKG_DIR=$(find $HOME/.libreelec/projects/$PROJECT/packages -name $1 2>/dev/null) if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then . $_PKG_DIR/package.mk else - local _PKG_DIR=$(find $HOME/.openelec/packages -name $1 2>/dev/null) + local _PKG_DIR=$(find $HOME/.libreelec/packages -name $1 2>/dev/null) if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then . $_PKG_DIR/package.mk else @@ -273,27 +273,27 @@ dashes="===========================" check_config() { dashes="===========================" - if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.openelec/projects/$PROJECT ]; then + if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.libreelec/projects/$PROJECT ]; then check_project="$check_project\n $dashes$dashes$dashes" check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config" check_project="$check_project\n $dashes$dashes$dashes" check_project="$check_project\n\n Valid projects:" - for projects in $PROJECT_DIR/* $HOME/.openelec/projects/*; do + for projects in $PROJECT_DIR/* $HOME/.libreelec/projects/*; do check_project="$check_project\n - $(basename $projects)" done echo -e $check_project exit 1 fi - if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.openelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then + if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.libreelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then 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 for your project or create a new config" check_arch="$check_arch\n $dashes$dashes$dashes" check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT" - for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.openelec/projects/$PROJECT/linux/*.conf; do + for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.libreelec/projects/$PROJECT/linux/*.conf; do check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")" done echo -e $check_arch diff --git a/config/noobs/os.json b/config/noobs/os.json index 321969778e..fe3ebd04ac 100644 --- a/config/noobs/os.json +++ b/config/noobs/os.json @@ -1,6 +1,6 @@ { "name": "@DISTRONAME@_@PROJECT@", - "version": "@OPENELEC_VERSION@", + "version": "@LIBREELEC_VERSION@", "release_date": "@RELEASE_DATE@", "kernel": "@KERNEL_VERSION@", "description": "@DESCRIPTION@", diff --git a/config/noobs/partition_setup.sh b/config/noobs/partition_setup.sh index 3e9f465af1..d6b9c16c67 100755 --- a/config/noobs/partition_setup.sh +++ b/config/noobs/partition_setup.sh @@ -17,21 +17,21 @@ # along with OpenELEC. If not, see . ################################################################################ -MOUNTPOINT="/tmp/OpenELEC-System" +MOUNTPOINT="/tmp/LibreELEC-System" md5sumCheck() { ( cd $MOUNTPOINT echo "checking MD5: $1" md5sum -c $1.md5 if [ "$?" = "1" ]; then - echo "######################################################" - echo "# #" - echo "# OpenELEC failed md5 check - Installation will quit #" - echo "# #" - echo "# Your original download was probably corrupt. #" - echo "# Please visit www.openelec.tv and get another copy #" - echo "# #" - echo "######################################################" + echo "#######################################################" + echo "# #" + echo "# LibreELEC failed md5 check - Installation will quit #" + echo "# #" + echo "# Your original download was probably corrupt. #" + echo "# Please visit www.libreelec.tv and get another copy #" + echo "# #" + echo "#######################################################" exit 1 fi rm -rf $1.md5 diff --git a/config/options b/config/options index fcf47761f3..0dc3094547 100644 --- a/config/options +++ b/config/options @@ -2,9 +2,9 @@ export LC_ALL=C # determines DISTRO, if not forced by user -# default is OpenELEC +# default is LibreELEC if [ -z "$DISTRO" ]; then - DISTRO="OpenELEC" + DISTRO="LibreELEC" else DISTRO="$DISTRO" fi @@ -82,21 +82,21 @@ fi CCACHE_CACHE_SIZE="30G" # install devtools on development builds - if [ "$OPENELEC_VERSION" = "devel" ]; then + if [ "$LIBREELEC_VERSION" = "devel" ]; then DEVTOOLS=yes fi # read options from $HOME if available - if [ -f "$HOME/.openelec/options" ]; then - . $HOME/.openelec/options + if [ -f "$HOME/.libreelec/options" ]; then + . $HOME/.libreelec/options fi - if [ -f "$HOME/.openelec/projects/$PROJECT/options" ]; then - . $HOME/.openelec/projects/$PROJECT/options + if [ -f "$HOME/.libreelec/projects/$PROJECT/options" ]; then + . $HOME/.libreelec/projects/$PROJECT/options fi # read distro options from $HOME if available - if [ -f "$HOME/.openelec/options.$DISTRO" ]; then - . $HOME/.openelec/options.$DISTRO + if [ -f "$HOME/.libreelec/options.$DISTRO" ]; then + . $HOME/.libreelec/options.$DISTRO fi # overwrite OEM_SUPPORT via commandline diff --git a/config/path b/config/path index 59270310be..a1e72428b2 100644 --- a/config/path +++ b/config/path @@ -17,11 +17,11 @@ set -e fi HOST_NAME=`$LOCAL_CC -dumpmachine` -TARGET_NAME=$TARGET_GCC_ARCH-openelec-linux-gnu${TARGET_ABI} +TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI} -BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION -if [ "$OPENELEC_VERSION" = "devel" ] ; then - BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION +BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION +if [ "$LIBREELEC_VERSION" = "devel" ] ; then + BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION fi if [ -n "$BUILD_SUFFIX" ]; then @@ -78,7 +78,7 @@ SED="sed -i" PKG_DIR="" # check project folder for a package in home dir - for DIR in $(find $HOME/.openelec/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do + for DIR in $(find $HOME/.libreelec/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do if [ -r "$DIR/package.mk" ]; then # found first, set $PKG_DIR PKG_DIR="$DIR" @@ -95,7 +95,7 @@ SED="sed -i" done # check for a package in home dir if not found already - for DIR in $(find $HOME/.openelec/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do + for DIR in $(find $HOME/.libreelec/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do if [ -r "$DIR/package.mk" ]; then # found first, set $PKG_DIR PKG_DIR="$DIR" @@ -207,7 +207,7 @@ HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pk HOST_PKG_CONFIG_SYSROOT_DIR="" if [ -z "$CCACHE_DIR" ]; then - export CCACHE_DIR=$HOME/.ccache-openelec + export CCACHE_DIR=$HOME/.ccache-libreelec fi export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config diff --git a/config/version b/config/version index f7d24d96c7..95c096944c 100644 --- a/config/version +++ b/config/version @@ -1,5 +1,5 @@ # VERSION: set full version, use "devel" for development version - OPENELEC_VERSION="devel" + LIBREELEC_VERSION="devel" # OS_VERSION: OS Version OS_VERSION="7.0" diff --git a/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml b/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml index 4b2661642e..11d1cce5fc 100644 --- a/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml +++ b/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml @@ -1,10 +1,10 @@ + provider-name="LibreELEC Community"> + name="LibreELEC Add-ons (unofficial)"> http://unofficial.addon.pro/addons/7.0/@PROJECT@/@ARCH@/addons.xml http://unofficial.addon.pro/addons/7.0/@PROJECT@/@ARCH@/addons.xml.md5 @@ -12,9 +12,9 @@ - OpenELEC Add-ons (unofficial) - The OpenELEC unofficial repository contains community provided add-ons. These add-ons are not supported by OpenELEC staff. Please check the OpenELEC or Kodi forums for community support threads and ask the add-on author to submit fixes via GitHub. - Add-ons in this repository are not maintained or supported by OpenELEC staff. + LibreELEC Add-ons (unofficial) + The LibreELEC unofficial repository contains community provided add-ons. These add-ons are not supported by LibreELEC staff. Please check the LibreELEC or Kodi forums for community support threads and ask the add-on author to submit fixes via GitHub. + Add-ons in this repository are not maintained or supported by LibreELEC staff. all diff --git a/packages/mediacenter/OpenELEC-settings/package.mk b/packages/mediacenter/OpenELEC-settings/package.mk deleted file mode 100644 index 4b7937bb60..0000000000 --- a/packages/mediacenter/OpenELEC-settings/package.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="OpenELEC-settings" -PKG_VERSION="0.6.12" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="prop." -PKG_SITE="http://www.openelec.tv" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python connman pygobject dbus-python" -PKG_PRIORITY="optional" -PKG_SECTION="" -PKG_SHORTDESC="OpenELEC-settings: Settings dialog for OpenELEC" -PKG_LONGDESC="OpenELEC-settings: is a settings dialog for OpenELEC" - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -PKG_MAKE_OPTS_TARGET="DISTRONAME=$DISTRONAME ROOT_PASSWORD=$ROOT_PASSWORD" - -if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET setxkbmap" -else - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bkeymaps" -fi - -post_makeinstall_target() { - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec - -# # bluetooth is optional -# if [ ! "$BLUETOOTH_SUPPORT" = yes ]; then -# rm -f resources/lib/modules/bluetooth.py -# fi - - python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.openelec.settings/resources/lib/ -f - rm -rf `find $INSTALL/usr/share/kodi/addons/service.openelec.settings/resources/lib/ -name "*.py"` - - python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.openelec.settings/oe.py -f - rm -rf $INSTALL/usr/share/kodi/addons/service.openelec.settings/oe.py -} - -post_install() { - enable_service backup-restore.service - enable_service factory-reset.service -} diff --git a/packages/mediacenter/OpenELEC-settings/scripts/backup-restore b/packages/mediacenter/OpenELEC-settings/scripts/backup-restore deleted file mode 100755 index 788b6082e6..0000000000 --- a/packages/mediacenter/OpenELEC-settings/scripts/backup-restore +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -BACKUP_FILE=`ls -1 /storage/.restore/??????????????.tar 2>/dev/null | tail -1` - -if [ -f "$BACKUP_FILE" ] ; then - echo -en "please wait.. checking backup file: " - tar tf $BACKUP_FILE &>/dev/null - ret=$? - if [ $ret -eq 0 ] ; then - echo OK - echo -en "restoring.. this may take long time to complete, please wait.. " - rm -rf /storage/.kodi &>/dev/null - rm -rf /storage/.cache &>/dev/null - rm -rf /storage/.config &>/dev/null - tar xf $BACKUP_FILE -C / &>/dev/null - rm -f $BACKUP_FILE &>/dev/null - echo done - echo "rebooting in 5s..." - sleep 5 - else - echo FAILED - rm -f $BACKUP_FILE &>/dev/null - echo "rebooting in 30s..." - sleep 30 - fi -fi -sync -reboot -f diff --git a/packages/mediacenter/OpenELEC-settings/scripts/factory-reset b/packages/mediacenter/OpenELEC-settings/scripts/factory-reset deleted file mode 100755 index b966790220..0000000000 --- a/packages/mediacenter/OpenELEC-settings/scripts/factory-reset +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -get_target() { - for arg in $(cat /proc/cmdline); do - case $arg in - disk=*) - disk="${arg#*=}" - case $disk in - LABEL=*) - label="${disk#*=}" - target=`blkid -L $label` - ;; - UUID=*) - uuid="${disk#*=}" - target=`blkid -U $uuid` - ;; - /*) - target=$disk - ;; - esac - ;; - esac - done -} - -if [ -f /storage/.cache/reset_oe ] ; then - # hard reset - rm -f /storage/.cache/reset_oe - get_target - if [ ! -z $target ] ; then - echo "hard resetting..." - umount /storage - mke2fs -t ext4 -m 0 $target 2>&1 >/dev/null - if [ ! -z $label ] ; then - tune2fs -U random -L $label $target - fi - if [ ! -z $uuid ] ; then - tune2fs -U $uuid $target - fi - echo "done" - sleep 5 - fi -elif [ -f /storage/.cache/reset_xbmc ] ; then - # soft reset - rm -f /storage/.cache/reset_xbmc - get_target - if [ ! -z $target ] ; then - echo "soft resetting..." - rm -rf /storage/.??* 2>&1 >/dev/null - echo "done" - sleep 5 - fi -fi -sync -reboot -f diff --git a/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.service b/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.service deleted file mode 100644 index abc385d245..0000000000 --- a/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Restoring Backup -DefaultDependencies=no - -[Service] -Type=idle -ExecStart=/usr/lib/openelec/backup-restore -StandardInput=tty-force -StandardOutput=inherit -StandardError=inherit diff --git a/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.target b/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.target deleted file mode 100644 index 8ade350df2..0000000000 --- a/packages/mediacenter/OpenELEC-settings/system.d/backup-restore.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Restoring Backup target -Requires=backup-restore.service -After=backup-restore.service -AllowIsolate=yes diff --git a/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.service b/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.service deleted file mode 100644 index 70aa5e2bd8..0000000000 --- a/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Factory reset -DefaultDependencies=no - -[Service] -Type=idle -ExecStart=/usr/lib/openelec/factory-reset -StandardInput=tty-force -StandardOutput=inherit -StandardError=inherit diff --git a/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.target b/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.target deleted file mode 100644 index 28c5aa4f20..0000000000 --- a/packages/mediacenter/OpenELEC-settings/system.d/factory-reset.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Factory reset target -Requires=factory-reset.service -After=factory-reset.service -AllowIsolate=yes diff --git a/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch index f12d512b07..3a01defe63 100644 --- a/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch +++ b/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch @@ -7,7 +7,7 @@ + + ButtonHomeSubCommonValues + -+ RunAddon(service.openelec.settings) ++ RunAddon(service.libreelec.settings) + ButtonHomeSubCommonValues diff --git a/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml b/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml deleted file mode 100644 index 206659f9da..0000000000 --- a/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/mediacenter/kodi/config/repository.openelec.tv/addon.xml b/packages/mediacenter/kodi/config/repository.openelec.tv/addon.xml deleted file mode 100644 index d5437d0393..0000000000 --- a/packages/mediacenter/kodi/config/repository.openelec.tv/addon.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - @ADDON_URL@/addons.xml - @ADDON_URL@/addons.xml.md5 - @ADDON_URL@ - - - OpenELEC Add-ons (official) - The OpenELEC official repository contains Kodi PVR Clients, Screensavers, Visualisations, the unofficial repo installer, and more. Add-ons in this repository are maintained and supported by OpenELEC staff and sponsors. If you find a broken or non-working add-on please report it via the forums. - all - - diff --git a/packages/mediacenter/kodi/config/repository.openelec.tv/icon.png b/packages/mediacenter/kodi/config/repository.openelec.tv/icon.png deleted file mode 100644 index 1147ae1d37..0000000000 Binary files a/packages/mediacenter/kodi/config/repository.openelec.tv/icon.png and /dev/null differ diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index c7b54079da..7d439aeae0 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -349,8 +349,8 @@ post_makeinstall_target() { cp $PKG_DIR/scripts/kodi-config $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/libreelec mkdir -p $INSTALL/usr/bin cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin @@ -369,10 +369,10 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/share/xsessions mkdir -p $INSTALL/usr/share/kodi/addons - cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/kodi/addons - $SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.openelec.tv/addon.xml - cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/kodi/addons - $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.openelec.tv/addon.xml + cp -R $PKG_DIR/config/os.libreelec.tv $INSTALL/usr/share/kodi/addons + $SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.libreelec.tv/addon.xml + cp -R $PKG_DIR/config/repository.libreelec.tv $INSTALL/usr/share/kodi/addons + $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.libreelec.tv/addon.xml mkdir -p $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi cp -R tools/EventClients/lib/python/* $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi diff --git a/packages/mediacenter/kodi/patches/README.patches b/packages/mediacenter/kodi/patches/README.patches index 08eb3a447f..e6d39e25ad 100644 --- a/packages/mediacenter/kodi/patches/README.patches +++ b/packages/mediacenter/kodi/patches/README.patches @@ -1,3 +1,3 @@ -100.* - OpenELEC specific patches that wont go upstream -995.* - OpenELEC specific patches that should be send upstream +100.* - LibreELEC specific patches that wont go upstream +995.* - LibreELEC specific patches that should be send upstream 999.* - patches backported from upstream diff --git a/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch b/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch index a976ab3dde..0148449750 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch @@ -6,7 +6,7 @@ index 48b99e8..856bf1e 100644 -+ http://feeds.openelec.tv/news ++ http://feeds.libreelec.tv/news http://feeds.kodi.tv/xbmc http://feeds.kodi.tv/latest_xbmc_addons http://feeds.kodi.tv/updated_xbmc_addons diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch index 48918646b5..375e4aaec8 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch @@ -19,7 +19,7 @@ index 377a49c..2fda194 100644 +void CallOEWrapper(const std::string& ID, bool disable) +{ + char cmd[255]; -+ snprintf(cmd, sizeof(cmd), "/usr/lib/openelec/systemd-addon-wrapper %s %d %d", ID.c_str(), disable); ++ snprintf(cmd, sizeof(cmd), "/usr/lib/libreelec/systemd-addon-wrapper %s %d %d", ID.c_str(), disable); + system(cmd); +} + diff --git a/packages/mediacenter/kodi/system.d/kodi-cleanlogs.service b/packages/mediacenter/kodi/system.d/kodi-cleanlogs.service index 6f1ae9c683..0b32a88742 100644 --- a/packages/mediacenter/kodi/system.d/kodi-cleanlogs.service +++ b/packages/mediacenter/kodi/system.d/kodi-cleanlogs.service @@ -1,7 +1,7 @@ [Unit] Description=Kodi clean debug logs ConditionKernelCommandLine=!debugging -ConditionPathExists=!/storage/.cache/debug.openelec +ConditionPathExists=!/storage/.cache/debug.libreelec Before=kodi.service [Service] diff --git a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service index 9785da7fdc..555b8108a0 100644 --- a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service +++ b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service @@ -5,11 +5,11 @@ After=connman.service Before=network-online.target DefaultDependencies=no Conflicts=shutdown.target -ConditionPathExists=/storage/.cache/openelec/network_wait +ConditionPathExists=/storage/.cache/libreelec/network_wait [Service] Type=oneshot -EnvironmentFile=/storage/.cache/openelec/network_wait +EnvironmentFile=/storage/.cache/libreelec/network_wait ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ... (max. $WAIT_NETWORK_TIME sec.)"' ExecStart=/usr/sbin/connmand-wait-online --timeout=${WAIT_NETWORK_TIME} StandardOutput=tty diff --git a/packages/mediacenter/kodi/system.d/kodi.service b/packages/mediacenter/kodi/system.d/kodi.service index 0c170b15d3..f946b273c8 100644 --- a/packages/mediacenter/kodi/system.d/kodi.service +++ b/packages/mediacenter/kodi/system.d/kodi.service @@ -8,8 +8,8 @@ Wants=network-online.target Environment=DISPLAY=:0.0 Environment=SDL_MOUSE_RELATIVE=0 Environment=HOME=/storage -EnvironmentFile=-/run/openelec/kodi.conf -EnvironmentFile=-/run/openelec/debug/kodi.conf +EnvironmentFile=-/run/libreelec/kodi.conf +EnvironmentFile=-/run/libreelec/debug/kodi.conf ExecStartPre=-/usr/lib/kodi/kodi-config ExecStart=/usr/lib/kodi/kodi.sh --standalone -fs $KODI_ARGS $KODI_DEBUG ExecStop=/bin/kill -TERM $MAINPID diff --git a/packages/network/avahi/system.d/avahi-daemon.service b/packages/network/avahi/system.d/avahi-daemon.service index ef4478669a..63cd640cb8 100644 --- a/packages/network/avahi/system.d/avahi-daemon.service +++ b/packages/network/avahi/system.d/avahi-daemon.service @@ -6,7 +6,7 @@ ConditionPathExists=/storage/.cache/services/avahi.conf [Service] Restart=on-failure -EnvironmentFile=-/run/openelec/debug/avahi.conf +EnvironmentFile=-/run/libreelec/debug/avahi.conf ExecStart=/usr/sbin/avahi-daemon -s $AVAHI_DEBUG ExecReload=/usr/sbin/avahi-daemon -r TimeoutStopSec=1s diff --git a/packages/network/bluez/system.d/bluetooth.service b/packages/network/bluez/system.d/bluetooth.service index 316b33b8a7..b4a0798cb4 100644 --- a/packages/network/bluez/system.d/bluetooth.service +++ b/packages/network/bluez/system.d/bluetooth.service @@ -7,7 +7,7 @@ ConditionPathExists=/storage/.cache/services/bluez.conf [Service] NotifyAccess=main EnvironmentFile=/storage/.cache/services/bluez.conf -EnvironmentFile=-/run/openelec/debug/bluez.conf +EnvironmentFile=-/run/libreelec/debug/bluez.conf ExecStart=/usr/lib/bluetooth/bluetoothd $BLUEZ_ARGS $BLUEZ_DEBUG CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW LimitNPROC=1 diff --git a/packages/network/bluez/system.d/obex.service b/packages/network/bluez/system.d/obex.service index 1a42d44f60..919d75babd 100644 --- a/packages/network/bluez/system.d/obex.service +++ b/packages/network/bluez/system.d/obex.service @@ -8,7 +8,7 @@ ConditionPathExists=/storage/.cache/services/bluez.conf [Service] EnvironmentFile=/storage/.cache/services/obexd.conf -EnvironmentFile=-/run/openelec/debug/obexd.conf +EnvironmentFile=-/run/libreelec/debug/obexd.conf ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT' ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG TimeoutStopSec=1s diff --git a/packages/network/connman/config/hosts.conf b/packages/network/connman/config/hosts.conf index 4ceb01e50c..82ec2eea77 100644 --- a/packages/network/connman/config/hosts.conf +++ b/packages/network/connman/config/hosts.conf @@ -4,7 +4,7 @@ # IP addresses # Format: -# Example: 192.168.0.3 openelec openelec.mynetwork +# Example: 192.168.0.3 libreelec libreelec.mynetwork # NOTE: do not edit /etc/hosts directly # edit /storage/.config/hosts.conf then reboot diff --git a/packages/network/connman/system.d/connman.service b/packages/network/connman/system.d/connman.service index 47610ce044..f65dfa8e98 100644 --- a/packages/network/connman/system.d/connman.service +++ b/packages/network/connman/system.d/connman.service @@ -10,7 +10,7 @@ Wants=network.target Type=dbus BusName=net.connman Restart=on-failure -EnvironmentFile=-/run/openelec/debug/connman.conf +EnvironmentFile=-/run/libreelec/debug/connman.conf ExecStartPre=-/bin/sh -c "echo -e 'nameserver 8.8.8.8\nnameserver 8.8.4.4' > /etc/resolv.conf" ExecStartPre=-/bin/sh -c "cat /storage/.cache/hostname > /proc/sys/kernel/hostname" ExecStartPre=-/bin/sh -c "cat /storage/.config/hosts.conf > /etc/hosts" diff --git a/packages/network/samba/default.d/samba.conf b/packages/network/samba/default.d/samba.conf index bdb07b1ff1..d77b5bca24 100644 --- a/packages/network/samba/default.d/samba.conf +++ b/packages/network/samba/default.d/samba.conf @@ -1,4 +1,4 @@ SAMBA_AUTOSHARE="true" -SAMBA_USERNAME="openelec" -SAMBA_PASSWORD="openelec" +SAMBA_USERNAME="libreelec" +SAMBA_PASSWORD="libreelec" SAMBA_SECURE="false" diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 23f6b75649..9e41f75e95 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -165,8 +165,8 @@ makeinstall_target() { cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/ ln -sf pastebinit $INSTALL/usr/bin/paste - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/fs-resize $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/fs-resize $INSTALL/usr/lib/libreelec mkdir -p $INSTALL/etc cp $PKG_DIR/config/profile $INSTALL/etc diff --git a/packages/sysutils/busybox/system.d/debug-shell.service b/packages/sysutils/busybox/system.d/debug-shell.service index f1469bd9c4..ce7cfc45b3 100644 --- a/packages/sysutils/busybox/system.d/debug-shell.service +++ b/packages/sysutils/busybox/system.d/debug-shell.service @@ -4,7 +4,7 @@ Description=Debug Shell DefaultDependencies=no ConditionKernelCommandLine=|tty ConditionKernelCommandLine=|debugging -ConditionPathExists=|/storage/.cache/debug.openelec +ConditionPathExists=|/storage/.cache/debug.libreelec [Service] Environment=TTY=3 diff --git a/packages/sysutils/busybox/system.d/fs-resize.service b/packages/sysutils/busybox/system.d/fs-resize.service index 2f2aaa4ab5..b3a85d6460 100644 --- a/packages/sysutils/busybox/system.d/fs-resize.service +++ b/packages/sysutils/busybox/system.d/fs-resize.service @@ -4,7 +4,7 @@ DefaultDependencies=no [Service] Type=idle -ExecStart=/usr/lib/openelec/fs-resize +ExecStart=/usr/lib/libreelec/fs-resize StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/packages/sysutils/busybox/system.d/var-log-debug.service b/packages/sysutils/busybox/system.d/var-log-debug.service index 9bf55bebc5..a8e9efc0fd 100644 --- a/packages/sysutils/busybox/system.d/var-log-debug.service +++ b/packages/sysutils/busybox/system.d/var-log-debug.service @@ -5,7 +5,7 @@ After=var.mount Before=systemd-journal-flush.service ConditionKernelCommandLine=!installer ConditionKernelCommandLine=|debugging -ConditionPathExists=|/storage/.cache/debug.openelec +ConditionPathExists=|/storage/.cache/debug.libreelec [Service] Type=oneshot diff --git a/packages/sysutils/imx6-soc-fan/package.mk b/packages/sysutils/imx6-soc-fan/package.mk index 7904e67f0d..25f92fc06c 100644 --- a/packages/sysutils/imx6-soc-fan/package.mk +++ b/packages/sysutils/imx6-soc-fan/package.mk @@ -42,8 +42,8 @@ makeinstall_target() { mkdir -p $INSTALL/usr/bin cp $PKG_DIR/bin/* $INSTALL/usr/bin - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/* $INSTALL/usr/lib/libreelec } post_install() { diff --git a/packages/sysutils/imx6-soc-fan/system.d/imx6-soc-fan-monitor.service b/packages/sysutils/imx6-soc-fan/system.d/imx6-soc-fan-monitor.service index 5311b9ab5f..33053c75d9 100644 --- a/packages/sysutils/imx6-soc-fan/system.d/imx6-soc-fan-monitor.service +++ b/packages/sysutils/imx6-soc-fan/system.d/imx6-soc-fan-monitor.service @@ -2,7 +2,7 @@ Description=i.MX6 SoC fan monitor service [Service] -ExecStart=/bin/sh -c "exec /bin/sh /usr/lib/openelec/imx6-soc-fan-monitor" +ExecStart=/bin/sh -c "exec /bin/sh /usr/lib/libreelec/imx6-soc-fan-monitor" RestartPreventExitStatus=12 TimeoutStopSec=5 Restart=always diff --git a/packages/sysutils/imx6-status-led/package.mk b/packages/sysutils/imx6-status-led/package.mk index 497ded225c..0b0f2a216c 100644 --- a/packages/sysutils/imx6-status-led/package.mk +++ b/packages/sysutils/imx6-status-led/package.mk @@ -36,8 +36,8 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/* $INSTALL/usr/lib/libreelec } post_install() { diff --git a/packages/sysutils/imx6-status-led/system.d/imx6-status-led.service b/packages/sysutils/imx6-status-led/system.d/imx6-status-led.service index f04bd3eafe..464739f665 100644 --- a/packages/sysutils/imx6-status-led/system.d/imx6-status-led.service +++ b/packages/sysutils/imx6-status-led/system.d/imx6-status-led.service @@ -4,8 +4,8 @@ After=kodi.service [Service] Type=oneshot -ExecStart=-/bin/sh -c "/usr/lib/openelec/imx6-status-led on" -ExecStop=-/bin/sh -c "/usr/lib/openelec/imx6-status-led heartbeat" +ExecStart=-/bin/sh -c "/usr/lib/libreelec/imx6-status-led on" +ExecStop=-/bin/sh -c "/usr/lib/libreelec/imx6-status-led heartbeat" RemainAfterExit=yes [Install] diff --git a/packages/sysutils/lcdproc/package.mk b/packages/sysutils/lcdproc/package.mk index efc8b1cb90..27a99a87b3 100644 --- a/packages/sysutils/lcdproc/package.mk +++ b/packages/sysutils/lcdproc/package.mk @@ -72,8 +72,8 @@ post_makeinstall_target() { -e "s|^#normal_font=.*$|normal_font=/usr/share/fonts/liberation/LiberationMono-Bold.ttf|" \ -i $INSTALL/etc/LCDd.conf - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/lcd-wrapper $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/lcd-wrapper $INSTALL/usr/lib/libreelec } diff --git a/packages/sysutils/lcdproc/system.d/lcdd.service b/packages/sysutils/lcdproc/system.d/lcdd.service index 3cc45cdf66..83dadf6596 100644 --- a/packages/sysutils/lcdproc/system.d/lcdd.service +++ b/packages/sysutils/lcdproc/system.d/lcdd.service @@ -5,7 +5,7 @@ After=multi-user.target [Service] EnvironmentFile=-/storage/.cache/services/lcdd.conf -ExecStart=/bin/sh -c 'exec /usr/lib/openelec/lcd-wrapper' +ExecStart=/bin/sh -c 'exec /usr/lib/libreelec/lcd-wrapper' TimeoutStopSec=1s Restart=always RestartSec=5 diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index 0b097de711..8a2be7e81a 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -59,8 +59,8 @@ post_makeinstall_target() { cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc - mkdir -p $INSTALL/usr/lib/openelec - cp $PKG_DIR/scripts/lircd_helper $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp $PKG_DIR/scripts/lircd_helper $INSTALL/usr/lib/libreelec mkdir -p $INSTALL/usr/lib/udev cp $PKG_DIR/scripts/lircd_wakeup_enable $INSTALL/usr/lib/udev diff --git a/packages/sysutils/lirc/system.d/lircd@.service b/packages/sysutils/lirc/system.d/lircd@.service index ff293c7bff..60d9c010ea 100644 --- a/packages/sysutils/lirc/system.d/lircd@.service +++ b/packages/sysutils/lirc/system.d/lircd@.service @@ -3,8 +3,8 @@ Description=Lirc with %I [Service] Type=oneshot -ExecStart=/usr/lib/openelec/lircd_helper add %I -ExecStop=/usr/lib/openelec/lircd_helper remove %I +ExecStart=/usr/lib/libreelec/lircd_helper add %I +ExecStop=/usr/lib/libreelec/lircd_helper remove %I TimeoutStopSec=1 RemainAfterExit=yes diff --git a/packages/sysutils/systemd/system.d/debugconfig.service b/packages/sysutils/systemd/system.d/debugconfig.service index e77759b5e9..4261d0cf44 100644 --- a/packages/sysutils/systemd/system.d/debugconfig.service +++ b/packages/sysutils/systemd/system.d/debugconfig.service @@ -3,11 +3,11 @@ Description=Setup debug config DefaultDependencies=no After=systemd-tmpfiles-setup.service ConditionKernelCommandLine=|debugging -ConditionPathExists=|/storage/.cache/debug.openelec +ConditionPathExists=|/storage/.cache/debug.libreelec [Service] Type=oneshot -ExecStart=/bin/sh -c 'cp /usr/share/debugconf/*.conf /run/openelec/debug' +ExecStart=/bin/sh -c 'cp /usr/share/debugconf/*.conf /run/libreelec/debug' RemainAfterExit=yes [Install] diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 0327e211b1..60b7e26948 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -100,8 +100,8 @@ fi post_makeinstall_target() { if [ "$SWAP_SUPPORT" = "yes" ]; then - mkdir -p $INSTALL/usr/lib/openelec - cp -PR $PKG_DIR/scripts/mount-swap $INSTALL/usr/lib/openelec + mkdir -p $INSTALL/usr/lib/libreelec + cp -PR $PKG_DIR/scripts/mount-swap $INSTALL/usr/lib/libreelec mkdir -p $INSTALL/etc cat $PKG_DIR/config/swap.conf | \ diff --git a/packages/sysutils/util-linux/system.d/swap.service b/packages/sysutils/util-linux/system.d/swap.service index ba56099aaa..4bf0f8fb0b 100644 --- a/packages/sysutils/util-linux/system.d/swap.service +++ b/packages/sysutils/util-linux/system.d/swap.service @@ -13,8 +13,8 @@ ConditionKernelCommandLine=!installer [Service] Environment=HOME=/storage Type=oneshot -ExecStartPre=/usr/lib/openelec/mount-swap create -ExecStart=/usr/lib/openelec/mount-swap mount +ExecStartPre=/usr/lib/libreelec/mount-swap create +ExecStart=/usr/lib/libreelec/mount-swap mount RemainAfterExit=yes [Install] diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk index 45ce5964f0..1f38482861 100644 --- a/packages/virtual/mediacenter/package.mk +++ b/packages/virtual/mediacenter/package.mk @@ -43,7 +43,7 @@ if [ "$MEDIACENTER" = "kodi" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto" # other packages - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET OpenELEC-settings" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET LibreELEC-settings" if [ "$KODI_LANGUAGE_ADDONS" = "yes" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-language-addons" diff --git a/packages/x11/other/fluxbox/config/keys b/packages/x11/other/fluxbox/config/keys index 10dc635a30..7a4a523a55 100644 --- a/packages/x11/other/fluxbox/config/keys +++ b/packages/x11/other/fluxbox/config/keys @@ -1,4 +1,4 @@ -# This is all we need in OpenELEC +# This is all we need # alt-tab Mod1 Tab :NextWindow {groups} (workspace=[current]) Mod1 Shift Tab :PrevWindow {groups} (workspace=[current]) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index d1f8a617fe..3e392f4b4e 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -126,7 +126,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --with-gnu-ld \ --with-sha1=libcrypto \ --without-systemd-daemon \ - --with-os-vendor=OpenELEC.tv \ + --with-os-vendor=LibreELEC.tv \ --with-module-dir=$XORG_PATH_MODULES \ --with-xkb-path=$XORG_PATH_XKB \ --with-xkb-output=/var/cache/xkb \ diff --git a/packages/x11/xserver/xorg-server/system.d/xorg.service b/packages/x11/xserver/xorg-server/system.d/xorg.service index 683e36ebea..a9dbde6893 100644 --- a/packages/x11/xserver/xorg-server/system.d/xorg.service +++ b/packages/x11/xserver/xorg-server/system.d/xorg.service @@ -6,7 +6,7 @@ ConditionKernelCommandLine=!installer [Service] Type=notify -EnvironmentFile=-/run/openelec/debug/xorg.conf +EnvironmentFile=-/run/libreelec/debug/xorg.conf ExecStart=/usr/bin/xorg-launch -nolisten tcp vt01 $XORG_DEBUG Restart=always RestartSec=2 diff --git a/projects/WeTek_Core/install/updater-script b/projects/WeTek_Core/install/updater-script index 954414988d..05cbc97287 100644 --- a/projects/WeTek_Core/install/updater-script +++ b/projects/WeTek_Core/install/updater-script @@ -33,4 +33,4 @@ write_raw_image(package_extract_file("logo.img"), "logo"); set_bootloader_env("upgrade_step", "1"); show_progress(0.100000, 0); -ui_print("OpenELEC Installed Successfully"); +ui_print("LibreELEC Installed Successfully"); diff --git a/projects/WeTek_Play/install/updater-script b/projects/WeTek_Play/install/updater-script index 97e9e9166f..87b5bb47e9 100644 --- a/projects/WeTek_Play/install/updater-script +++ b/projects/WeTek_Play/install/updater-script @@ -29,4 +29,4 @@ write_raw_image(package_extract_file("logo.img"), "logo"); set_bootloader_env("upgrade_step", "1"); show_progress(0.100000, 0); -ui_print("OpenELEC Installed Successfully"); +ui_print("LibreELEC Installed Successfully"); diff --git a/scripts/create_addon b/scripts/create_addon index afae5f87da..0c491da799 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -83,7 +83,7 @@ pack_addon() { cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID fi - PROVIDER_NAME="openelec.tv" + PROVIDER_NAME="libreelec.tv" if [ ! -z "$PKG_MAINTAINER" ] ; then PROVIDER_NAME="$PKG_MAINTAINER" fi diff --git a/scripts/image b/scripts/image index a8d5eff183..2c4951dd1d 100755 --- a/scripts/image +++ b/scripts/image @@ -33,21 +33,21 @@ $SCRIPTS/build populatefs:host BUILD_DATE=`date +%Y%m%d%H%M%S` -if [ "$OPENELEC_VERSION" = devel ]; then +if [ "$LIBREELEC_VERSION" = devel ]; then if ! GIT_BUILD=$(git rev-list --count HEAD 2>/dev/null) then GIT_BUILD=$(git rev-list HEAD | wc -l) fi GIT_HASH=$(git rev-parse HEAD) GIT_ABBREV=$(git log -1 --pretty=format:%h) - DEVEL_VERSION=$OPENELEC_VERSION - OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV + DEVEL_VERSION=$LIBREELEC_VERSION + LIBREELEC_VERSION=$LIBREELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV fi -TARGET_VERSION="$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION" +TARGET_VERSION="$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION" IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" if [ "$DEVEL_VERSION" = "devel" ] ; then - IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION" + IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION" fi if [ "$PROJECT" == "imx6" -a -n "$SYSTEM" ]; then @@ -94,20 +94,20 @@ fi # create /etc/os-release echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release - echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release - echo -e "ID=\"openelec\"" >> $INSTALL/etc/os-release + echo -e "VERSION=\"$LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release + echo -e "ID=\"libreelec\"" >> $INSTALL/etc/os-release echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release - echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) - Version: $OPENELEC_VERSION\"" >> $INSTALL/etc/os-release - echo -e "HOME_URL=\"http://www.openelec.tv\"" >> $INSTALL/etc/os-release - echo -e "BUG_REPORT_URL=\"https://github.com/OpenELEC/OpenELEC.tv\"" >> $INSTALL/etc/os-release + echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) - Version: $LIBREELEC_VERSION\"" >> $INSTALL/etc/os-release + echo -e "HOME_URL=\"http://www.libreelec.tv\"" >> $INSTALL/etc/os-release + echo -e "BUG_REPORT_URL=\"https://github.com/LibreELEC/LibreELEC.tv\"" >> $INSTALL/etc/os-release if [ -n "$GIT_HASH" ]; then echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release fi - echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release + echo -e "LIBREELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release if [ "$OFFICIAL" = "yes" ]; then - echo -e "OPENELEC_BUILD=\"official\"" >> $INSTALL/etc/os-release + echo -e "LIBREELEC_BUILD=\"official\"" >> $INSTALL/etc/os-release else - echo -e "OPENELEC_BUILD=\"community\"" >> $INSTALL/etc/os-release + echo -e "LIBREELEC_BUILD=\"community\"" >> $INSTALL/etc/os-release fi # create /etc/issue @@ -116,7 +116,7 @@ fi echo "$GREETING2" >> $INSTALL/etc/issue echo "$GREETING3" >> $INSTALL/etc/issue echo "$GREETING4" >> $INSTALL/etc/issue - echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) Version: $OPENELEC_VERSION" >> $INSTALL/etc/issue + echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community")) Version: $LIBREELEC_VERSION" >> $INSTALL/etc/issue if [ -n "$GIT_HASH" ]; then echo "$DISTRONAME git: $GIT_HASH" >> $INSTALL/etc/issue fi @@ -181,10 +181,10 @@ fi fi # copy vendor related files to filesystem - if [ -d "$HOME/.openelec/filesystem" ]; then - cp -PR $HOME/.openelec/filesystem/* $INSTALL + if [ -d "$HOME/.libreelec/filesystem" ]; then + cp -PR $HOME/.libreelec/filesystem/* $INSTALL # install project specific systemd services - for service in $HOME/.openelec/filesystem/usr/lib/systemd/system/*.service ; do + for service in $HOME/.libreelec/filesystem/usr/lib/systemd/system/*.service ; do if [ -f "$service" ] ; then enable_service $(basename $service) fi @@ -192,10 +192,10 @@ fi fi # copy vendor project related files to filesystem - if [ -d "$HOME/.openelec/projects/$PROJECT/filesystem" ]; then - cp -PR $HOME/.openelec/projects/$PROJECT/filesystem/* $INSTALL + if [ -d "$HOME/.libreelec/projects/$PROJECT/filesystem" ]; then + cp -PR $HOME/.libreelec/projects/$PROJECT/filesystem/* $INSTALL # install project specific systemd services - for service in $HOME/.openelec/projects/$PROJECT/filesystem/usr/lib/systemd/system/*.service ; do + for service in $HOME/.libreelec/projects/$PROJECT/filesystem/usr/lib/systemd/system/*.service ; do if [ -f "$service" ] ; then enable_service $(basename $service) fi @@ -441,7 +441,7 @@ fi sed -e "s%@DISTRONAME@%$DISTRONAME%g" \ -e "s%@PROJECT@%$PROJECT%g" \ - -e "s%@OPENELEC_VERSION@%$OPENELEC_VERSION%g" \ + -e "s%@LIBREELEC_VERSION@%$LIBREELEC_VERSION%g" \ -e "s%@RELEASE_DATE@%$(date +%F)%g" \ -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \ -e "s%@DESCRIPTION@%$DESCRIPTION%g" \