From 812739f7d68121682fde6e756b8ebcf92872b56d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH] slice: fix slice addon build --- packages/addons/service/slice/package.mk | 6 ++++++ packages/tools/led_tools/package.mk | 3 ++- packages/tools/slice-addon/package.mk | 24 ------------------------ 3 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 packages/tools/slice-addon/package.mk diff --git a/packages/addons/service/slice/package.mk b/packages/addons/service/slice/package.mk index f70f73173b..4ee9d331e4 100644 --- a/packages/addons/service/slice/package.mk +++ b/packages/addons/service/slice/package.mk @@ -19,6 +19,12 @@ PKG_ADDON_NAME="Slice" PKG_ADDON_PROJECTS="Slice Slice3" PKG_ADDON_TYPE="xbmc.service" +makeinstall_target() { + PKG_ADDON_INSTALL_DIR="${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}" + mkdir -p "${PKG_ADDON_INSTALL_DIR}" + install_addon_files "${PKG_ADDON_INSTALL_DIR}" +} + addon() { : } diff --git a/packages/tools/led_tools/package.mk b/packages/tools/led_tools/package.mk index 838eaa827f..dfcf597683 100644 --- a/packages/tools/led_tools/package.mk +++ b/packages/tools/led_tools/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2014 Gordon Hollingworth (gordon@fiveninjas.com) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="led_tools" PKG_VERSION="0.1" @@ -7,7 +8,7 @@ PKG_SHA256="0484b4a2da9d586accef87ba7dd18595baae1d602c1b1bd9e0a8565ab50419a2" PKG_LICENSE="GPL" PKG_SITE="http://www.fiveninjas.com" PKG_URL="http://updates.fiveninjas.com/src/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain zlib libpng slice-addon" +PKG_DEPENDS_TARGET="toolchain zlib libpng slice" PKG_DEPENDS_HOST="toolchain" PKG_LONGDESC="LED tools, these are a set of tools to control the LEDs on Slice" diff --git a/packages/tools/slice-addon/package.mk b/packages/tools/slice-addon/package.mk deleted file mode 100644 index b96a7c16ac..0000000000 --- a/packages/tools/slice-addon/package.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="slice-addon" -PKG_VERSION="1.0" -PKG_REV="101" -PKG_LICENSE="GPL" -PKG_SITE="" -PKG_URL="" -PKG_DEPENDS_TARGET="" -PKG_LONGDESC="Controls the LED lights on the Slice box using Kodi actions" -PKG_TOOLCHAIN="manual" - -make_target() { -( - cd $ROOT - scripts/create_addon slice -) -} - -makeinstall_target() { - mkdir -p $INSTALL/usr/share/kodi/addons - cp -R $BUILD/$ADDONS/slice/service.slice $INSTALL/usr/share/kodi/addons -}