From 673fcfd4dc00f0e00179383798c1c7e08f7030f6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 18 Jan 2015 17:14:47 +0200 Subject: [PATCH] kodi: remove kodi-rebrand --- packages/mediacenter/kodi/package.mk | 5 ---- .../mediacenter/kodi/scripts/kodi-rebrand | 26 ------------------- .../kodi/system.d/kodi-rebrand.service | 13 ---------- 3 files changed, 44 deletions(-) delete mode 100755 packages/mediacenter/kodi/scripts/kodi-rebrand delete mode 100644 packages/mediacenter/kodi/system.d/kodi-rebrand.service diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 808937558a..320e7cd136 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -417,8 +417,6 @@ post_makeinstall_target() { cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi-hacks $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi-sources $INSTALL/usr/lib/kodi -# TODO: remove this later: - cp $PKG_DIR/scripts/kodi-rebrand $INSTALL/usr/lib/kodi mkdir -p $INSTALL/usr/lib/openelec cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec @@ -504,7 +502,4 @@ post_install() { enable_service kodi-waitonnetwork.service enable_service kodi.service enable_service kodi-lirc-suspend.service - -# TODO: remove this later - enable_service kodi-rebrand.service } diff --git a/packages/mediacenter/kodi/scripts/kodi-rebrand b/packages/mediacenter/kodi/scripts/kodi-rebrand deleted file mode 100755 index 3897290205..0000000000 --- a/packages/mediacenter/kodi/scripts/kodi-rebrand +++ /dev/null @@ -1,26 +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 . -################################################################################ - -# move XBMC configdir to Kodi configdir -# TODO: remove the .xbmc symlink later - -if [ -d /storage/.xbmc -a ! -d /storage/.kodi ]; then - mv /storage/.xbmc /storage/.kodi - ln -sf .kodi /storage/.xbmc -fi diff --git a/packages/mediacenter/kodi/system.d/kodi-rebrand.service b/packages/mediacenter/kodi/system.d/kodi-rebrand.service deleted file mode 100644 index 04d4cd72d7..0000000000 --- a/packages/mediacenter/kodi/system.d/kodi-rebrand.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Kodi config dir rebrand -DefaultDependencies=no -Before=local-fs.target shutdown.target -Conflicts=shutdown.target - -[Service] -Type=oneshot -ExecStart=/usr/lib/kodi/kodi-rebrand -RemainAfterExit=yes - -[Install] -WantedBy=local-fs.target