From 9c17ed5fc2a8d42f72f9e2a257a869831594e03e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 16 Mar 2016 04:47:53 +0000 Subject: [PATCH] Rebranding: Follow up --- .../driver/hdhomerun/source/resources/lib/functions.py | 2 +- ...00.13-udevprovider-filter-out-OE-specific-mounts.patch | 2 +- packages/mediacenter/kodi/scripts/kodi-config | 4 ++-- .../amremote/config/{openelec.conf => libreelec.conf} | 0 packages/sysutils/amremote/package.mk | 4 ++-- packages/sysutils/amremote/scripts/remote-config | 2 +- .../sysutils/amremote/system.d/amlogic-remotecfg.service | 2 +- packages/sysutils/busybox/config/profile | 2 +- .../sysutils/busybox/sleep.d.serial/99-suspend-modules.sh | 8 ++++---- packages/sysutils/imx6-soc-fan/bin/imx6-soc-fan-control | 2 +- .../sysutils/imx6-soc-fan/scripts/imx6-soc-fan-monitor | 2 +- packages/sysutils/imx6-status-led/scripts/imx6-status-led | 2 +- packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf | 4 ++-- packages/tools/u-boot/scripts/update.sh | 4 ++-- packages/x11/util/xorg-launch-helper/scripts/xorg-launch | 4 ++-- packages/x11/xserver/xorg-server/scripts/xorg-configure | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) rename packages/sysutils/amremote/config/{openelec.conf => libreelec.conf} (100%) diff --git a/packages/addons/driver/hdhomerun/source/resources/lib/functions.py b/packages/addons/driver/hdhomerun/source/resources/lib/functions.py index 0f1cea3d31..2904cc4acd 100644 --- a/packages/addons/driver/hdhomerun/source/resources/lib/functions.py +++ b/packages/addons/driver/hdhomerun/source/resources/lib/functions.py @@ -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 """ diff --git a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch index 3b6e6c7438..986e281bbf 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch @@ -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); diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config index 261e9cfb3b..e20e35870c 100755 --- a/packages/mediacenter/kodi/scripts/kodi-config +++ b/packages/mediacenter/kodi/scripts/kodi-config @@ -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 diff --git a/packages/sysutils/amremote/config/openelec.conf b/packages/sysutils/amremote/config/libreelec.conf similarity index 100% rename from packages/sysutils/amremote/config/openelec.conf rename to packages/sysutils/amremote/config/libreelec.conf diff --git a/packages/sysutils/amremote/package.mk b/packages/sysutils/amremote/package.mk index 855e751656..aec7ad48ad 100644 --- a/packages/sysutils/amremote/package.mk +++ b/packages/sysutils/amremote/package.mk @@ -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 diff --git a/packages/sysutils/amremote/scripts/remote-config b/packages/sysutils/amremote/scripts/remote-config index f565ef579f..e1215c7e5a 100755 --- a/packages/sysutils/amremote/scripts/remote-config +++ b/packages/sysutils/amremote/scripts/remote-config @@ -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 diff --git a/packages/sysutils/amremote/system.d/amlogic-remotecfg.service b/packages/sysutils/amremote/system.d/amlogic-remotecfg.service index 26e9b2c985..a2c8c62767 100644 --- a/packages/sysutils/amremote/system.d/amlogic-remotecfg.service +++ b/packages/sysutils/amremote/system.d/amlogic-remotecfg.service @@ -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] diff --git a/packages/sysutils/busybox/config/profile b/packages/sysutils/busybox/config/profile index b03a5c4eab..77986d235a 100644 --- a/packages/sysutils/busybox/config/profile +++ b/packages/sysutils/busybox/config/profile @@ -28,7 +28,7 @@ esac done - if [ -e /storage/.cache/debug.openelec ] ; then + if [ -e /storage/.cache/debug.libreelec ] ; then export DEBUG=yes fi diff --git a/packages/sysutils/busybox/sleep.d.serial/99-suspend-modules.sh b/packages/sysutils/busybox/sleep.d.serial/99-suspend-modules.sh index b100eb13b1..110959e27c 100755 --- a/packages/sysutils/busybox/sleep.d.serial/99-suspend-modules.sh +++ b/packages/sysutils/busybox/sleep.d.serial/99-suspend-modules.sh @@ -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" || \ diff --git a/packages/sysutils/imx6-soc-fan/bin/imx6-soc-fan-control b/packages/sysutils/imx6-soc-fan/bin/imx6-soc-fan-control index 92d07ec0ad..699706848f 100755 --- a/packages/sysutils/imx6-soc-fan/bin/imx6-soc-fan-control +++ b/packages/sysutils/imx6-soc-fan/bin/imx6-soc-fan-control @@ -18,7 +18,7 @@ # along with OpenELEC. If not, see . ################################################################################ -. /usr/lib/openelec/imx6-system-type +. /usr/lib/libreelec/imx6-system-type if [ "$SYSTEM_TYPE" != "matrix" ]; then echo "Only for TBS Matrix system." diff --git a/packages/sysutils/imx6-soc-fan/scripts/imx6-soc-fan-monitor b/packages/sysutils/imx6-soc-fan/scripts/imx6-soc-fan-monitor index c27fa246a2..4f1cbae804 100755 --- a/packages/sysutils/imx6-soc-fan/scripts/imx6-soc-fan-monitor +++ b/packages/sysutils/imx6-soc-fan/scripts/imx6-soc-fan-monitor @@ -18,7 +18,7 @@ # along with OpenELEC. If not, see . ################################################################################ -. /usr/lib/openelec/imx6-system-type +. /usr/lib/libreelec/imx6-system-type if [ "$SYSTEM_TYPE" != "matrix" ]; then echo "Only for TBS Matrix system." diff --git a/packages/sysutils/imx6-status-led/scripts/imx6-status-led b/packages/sysutils/imx6-status-led/scripts/imx6-status-led index 46e08d58cb..d3ef9e05b0 100755 --- a/packages/sysutils/imx6-status-led/scripts/imx6-status-led +++ b/packages/sysutils/imx6-status-led/scripts/imx6-status-led @@ -18,7 +18,7 @@ # along with OpenELEC. If not, see . ################################################################################ -. /usr/lib/openelec/imx6-system-type +. /usr/lib/libreelec/imx6-system-type case "$1" in "on") diff --git a/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf b/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf index f61bd9c102..0cf4959b10 100644 --- a/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf +++ b/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf @@ -16,5 +16,5 @@ # along with OpenELEC. If not, see . ################################################################################ -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 - - diff --git a/packages/tools/u-boot/scripts/update.sh b/packages/tools/u-boot/scripts/update.sh index 71a5582a94..5821b02373 100755 --- a/packages/tools/u-boot/scripts/update.sh +++ b/packages/tools/u-boot/scripts/update.sh @@ -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 diff --git a/packages/x11/util/xorg-launch-helper/scripts/xorg-launch b/packages/x11/util/xorg-launch-helper/scripts/xorg-launch index 1534c76e2f..7e973c425f 100755 --- a/packages/x11/util/xorg-launch-helper/scripts/xorg-launch +++ b/packages/x11/util/xorg-launch-helper/scripts/xorg-launch @@ -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 diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure index 738d84e7d3..e7c638254f 100755 --- a/packages/x11/xserver/xorg-server/scripts/xorg-configure +++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure @@ -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