Rebranding: Follow up

This commit is contained in:
MilhouseVH 2016-03-16 04:47:53 +00:00
parent 2c999f7ae9
commit 9c17ed5fc2
16 changed files with 24 additions and 24 deletions

View File

@ -64,7 +64,7 @@ def get_devices_hdhomerun():
return tuners
"""
openelec:~ # hdhomerun_config discover
libreelec:~ # hdhomerun_config discover
hdhomerun device 12345678 found at 192.168.0.3
"""

View File

@ -15,7 +15,7 @@ index dffee34..b7cd25b 100644
continue;
}
+ // OE: filter out openelec specific mounts
+ // LE: filter out Libreelec specific mounts
+ if (strstr(mountpoint, "/flash"))
+ {
+ udev_device_unref(device);

View File

@ -24,7 +24,7 @@ chmod +x /storage/.kodi/addons/*/bin/*
# hack: update RSSnews.xml in userdata
if [ -f /storage/.kodi/userdata/RssFeeds.xml ]; then
sed -e "s,http://openelec.tv/news?format=feed&type=rss,http://feeds.openelec.tv/news,g" \
sed -e "s,http://libreelec.tv/news?format=feed&type=rss,http://feeds.libreelec.tv/news,g" \
-i /storage/.kodi/userdata/RssFeeds.xml
fi
@ -48,4 +48,4 @@ else
KODI_ARGS="--lircdev /run/lirc/lircd"
fi
echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/openelec/kodi.conf
echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/libreelec/kodi.conf

View File

@ -36,8 +36,8 @@ makeinstall_target() {
mkdir -p $INSTALL/usr/bin
cp remotecfg $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
mkdir -p $INSTALL/etc/amremote
cp $PKG_DIR/config/*.conf $INSTALL/etc/amremote

View File

@ -28,5 +28,5 @@ elif [ -f /storage/.config/remote.conf ]; then
elif [ "$LSUSB_RET" = 0 ]; then
/usr/bin/remotecfg /etc/amremote/wetek.conf
elif [ "$LSUSB_RET" = 1 ]; then
/usr/bin/remotecfg /etc/amremote/openelec.conf
/usr/bin/remotecfg /etc/amremote/libreelec.conf
fi

View File

@ -3,7 +3,7 @@ Description=Amlogic IR remote support
[Service]
Type=oneshot
ExecStart=/usr/lib/openelec/remote-config
ExecStart=/usr/lib/libreelec/remote-config
RemainAfterExit=yes
[Install]

View File

@ -28,7 +28,7 @@
esac
done
if [ -e /storage/.cache/debug.openelec ] ; then
if [ -e /storage/.cache/debug.libreelec ] ; then
export DEBUG=yes
fi

View File

@ -55,7 +55,7 @@ modunload()
_rmmod()
{
if modprobe -r "$1"; then
touch "/run/openelec/suspend/module:$1"
touch "/run/libreelec/suspend/module:$1"
return 0
else
logger -t suspend-modules "# could not unload '$1', usage count was $2"
@ -65,7 +65,7 @@ _rmmod()
resume_modules()
{
for x in /run/openelec/suspend/module:* ; do
for x in /run/libreelec/suspend/module:* ; do
[ -O "${x}" ] || continue
modprobe "${x##*:}" &>/dev/null && \
logger -t resume-modules "Reloaded module ${x##*:}." || \
@ -77,8 +77,8 @@ suspend_modules()
{
[ -z "$SUSPEND_MODULES" ] && return 0
# clean up
rm -rf /run/openelec/suspend
mkdir -p /run/openelec/suspend
rm -rf /run/libreelec/suspend
mkdir -p /run/libreelec/suspend
for x in $SUSPEND_MODULES ; do
modunload $x && \
logger -t suspend-modules "Unloading kernel module $x: Done" || \

View File

@ -18,7 +18,7 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /usr/lib/openelec/imx6-system-type
. /usr/lib/libreelec/imx6-system-type
if [ "$SYSTEM_TYPE" != "matrix" ]; then
echo "Only for TBS Matrix system."

View File

@ -18,7 +18,7 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /usr/lib/openelec/imx6-system-type
. /usr/lib/libreelec/imx6-system-type
if [ "$SYSTEM_TYPE" != "matrix" ]; then
echo "Only for TBS Matrix system."

View File

@ -18,7 +18,7 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /usr/lib/openelec/imx6-system-type
. /usr/lib/libreelec/imx6-system-type
case "$1" in
"on")

View File

@ -16,5 +16,5 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
d /run/openelec 0755 root root - -
d /run/openelec/debug 0755 root root - -
d /run/libreelec 0755 root root - -
d /run/libreelec/debug 0755 root root - -

View File

@ -33,8 +33,8 @@ if [ -z "$BOOT_DISK" ]; then
fi
SYSTEM_TYPE=""
if [ -f $SYSTEM_ROOT/usr/lib/openelec/imx6-system-type ]; then
. $SYSTEM_ROOT/usr/lib/openelec/imx6-system-type
if [ -f $SYSTEM_ROOT/usr/lib/librenelec/imx6-system-type ]; then
. $SYSTEM_ROOT/usr/lib/libreelec/imx6-system-type
fi
# mount $BOOT_ROOT r/w

View File

@ -19,7 +19,7 @@
# wait for xorg-configure@.service
# max 10 seconds
ARGS_FILE="/run/openelec/xorg-settings.conf"
ARGS_FILE="/run/libreelec/xorg-settings.conf"
for i in $(seq 1 40) ; do
if [ -e "$ARGS_FILE" ] ; then
break
@ -28,7 +28,7 @@ for i in $(seq 1 40) ; do
done
if [ -e "$ARGS_FILE" ] ; then
. /run/openelec/xorg-settings.conf
. /run/libreelec/xorg-settings.conf
exec xorg-launch-helper $@ $XORG_ARGS
else
echo "" > /dev/tty1

View File

@ -104,5 +104,5 @@ logger -t Xorg "### creating needed directories and symlinks ###"
################################################################################
logger -t Xorg "### starting Xorg with '$DISPLAY vt01 $XORG_ARGS' ###"
mkdir -p /run/openelec
echo "XORG_ARGS=\"$XORG_ARGS\"" > /run/openelec/xorg-settings.conf
mkdir -p /run/libreelec
echo "XORG_ARGS=\"$XORG_ARGS\"" > /run/libreelec/xorg-settings.conf