From 12a385d082cefd368efe589c1661a0b84abc1729 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 23 Jul 2018 10:16:47 +0100 Subject: [PATCH] distro: allow configurable settings addon --- distributions/LibreELEC/options | 3 +++ packages/virtual/mediacenter/package.mk | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 2db5e99d64..ea1c7be4ce 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -215,3 +215,6 @@ # Partition labels for USB/SD installation media DISTRO_BOOTLABEL="LIBREELEC" DISTRO_DISKLABEL="STORAGE" + +# Settings package name - blank if not required + DISTRO_PKG_SETTINGS="LibreELEC-settings" diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk index 89c7c6ad6b..4d397c1211 100644 --- a/packages/virtual/mediacenter/package.mk +++ b/packages/virtual/mediacenter/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mediacenter" PKG_VERSION="" @@ -23,9 +24,14 @@ if [ "$MEDIACENTER" = "kodi" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Pillow \ simplejson \ pycryptodome" + +# settings addon + if [ -n "$DISTRO_PKG_SETTINGS" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DISTRO_PKG_SETTINGS" + fi + # other packages - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET LibreELEC-settings \ - xmlstarlet" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xmlstarlet" if [ "$JOYSTICK_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET peripheral.joystick"