aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-12-28 16:05:42 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-28 22:13:49 +0100
commit21b5d859997ac30898d86a79bb683ada1849e965 (patch)
tree5e35b21d07a3dd3b20666684a044bcbefa0d9d8b
parentaa0b16d8690e8db9b2dc30291407e7bcc082596a (diff)
downloadbuildroot-21b5d859997ac30898d86a79bb683ada1849e965.tar.gz
buildroot-21b5d859997ac30898d86a79bb683ada1849e965.tar.bz2
package/kodi: fix leftover instance of 'xbmc'
During the XBMC -> Kodi rename, some instance of 'xbmc' were left out, which meant our startup script would not run Kodi, and that Kodi would create its /.kodi directory. This patch renames the missing bits. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rwxr-xr-xpackage/kodi/S50kodi2
-rw-r--r--package/kodi/kodi.mk20
2 files changed, 12 insertions, 10 deletions
diff --git a/package/kodi/S50kodi b/package/kodi/S50kodi
index 3b0049f554..8468c242b7 100755
--- a/package/kodi/S50kodi
+++ b/package/kodi/S50kodi
@@ -4,7 +4,7 @@
#
BIN=/usr/bin/br-kodi
-KODI=/usr/lib/xbmc/xbmc.bin
+KODI=/usr/lib/xbmc/kodi.bin
KODI_ARGS="--standalone -fs -n"
PIDFILE=/var/run/kodi.pid
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 8a52433e51..1fb7256171 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -203,16 +203,16 @@ endef
KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
define KODI_CLEAN_UNUSED_ADDONS
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/screensaver.rsxs.plasma
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.milkdrop
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.projectm
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.itunes
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_UNUSED_ADDONS
define KODI_CLEAN_CONFLUENCE_SKIN
- find $(TARGET_DIR)/usr/share/xbmc/addons/skin.confluence/media -name *.png -delete
- find $(TARGET_DIR)/usr/share/xbmc/addons/skin.confluence/media -name *.jpg -delete
+ find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete
+ find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN
@@ -223,12 +223,14 @@ endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_BR_WRAPPER
# When run from a startup script, Kodi has no $HOME where to store its
-# configuration, so ends up storing it in /.xbmc (yes, at the root of
+# configuration, so ends up storing it in /.kodi (yes, at the root of
# the rootfs). This is a problem for read-only filesystems. But we can't
-# easily change that, so create /.xbmc as a symlink where we want the
-# config to eventually be.
+# easily change that, so create /.kodi as a symlink where we want the
+# config to eventually be. Add synlinks for the legacy XBMC name as well
define KODI_INSTALL_CONFIG_DIR
$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/kodi
+ ln -sf /var/kodi $(TARGET_DIR)/.kodi
+ ln -sf /var/kodi $(TARGET_DIR)/var/xbmc
ln -sf /var/kodi $(TARGET_DIR)/.xbmc
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_CONFIG_DIR