Skip to content

Commit

Permalink
Merge pull request #1 from lrusak/rebrand
Browse files Browse the repository at this point in the history
initial rebranding to LibreELEC
  • Loading branch information
MilhouseVH committed Mar 13, 2016
2 parents 0de0a2a + 40af353 commit a8b4f06
Show file tree
Hide file tree
Showing 66 changed files with 403 additions and 200 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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.
42 changes: 21 additions & 21 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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?
Expand All @@ -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.

Expand Down Expand Up @@ -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 [email protected]:<your username>/OpenELEC.tv.git
git clone [email protected]:<your username>/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:
Expand Down Expand Up @@ -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
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[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
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.
Expand All @@ -55,16 +55,16 @@ 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).
All data transfered to the machine will go here, the rest of the system is
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,
Expand All @@ -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**
2 changes: 1 addition & 1 deletion config/addon/xbmc.python.module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version="@ADDON_VERSION@"
provider-name="@PROVIDER_NAME@">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
<import addon="os.libreelec.tv" version="@OS_VERSION@"/>
<import addon="xbmc.python" version="2.1.0"/>
@REQUIRES@
</requires>
Expand Down
2 changes: 1 addition & 1 deletion config/addon/xbmc.python.script.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version="@ADDON_VERSION@"
provider-name="@PROVIDER_NAME@">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
<import addon="os.libreelec.tv" version="@OS_VERSION@"/>
<import addon="xbmc.python" version="2.1.0"/>
@REQUIRES@
</requires>
Expand Down
2 changes: 1 addition & 1 deletion config/addon/xbmc.service.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version="@ADDON_VERSION@"
provider-name="@PROVIDER_NAME@">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
<import addon="os.libreelec.tv" version="@OS_VERSION@"/>
<import addon="xbmc.python" version="2.1.0"/>
@REQUIRES@
</requires>
Expand Down
28 changes: 14 additions & 14 deletions config/functions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/noobs/os.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@DISTRONAME@_@PROJECT@",
"version": "@OPENELEC_VERSION@",
"version": "@LIBREELEC_VERSION@",
"release_date": "@RELEASE_DATE@",
"kernel": "@KERNEL_VERSION@",
"description": "@DESCRIPTION@",
Expand Down
18 changes: 9 additions & 9 deletions config/noobs/partition_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################

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
Expand Down
18 changes: 9 additions & 9 deletions config/options
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit a8b4f06

Please sign in to comment.