From 69b91b75b10030f20aadff9a3ab34f961970c1ed Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 17 Nov 2019 04:37:26 +0000 Subject: [PATCH] docker: avoid hard coding settings addon id --- packages/addons/service/docker/package.mk | 4 ++++ packages/addons/service/docker/source/default.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 5c9049a844..d3c542da62 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -146,3 +146,7 @@ addon() { # tini cp -P $(get_build_dir tini)/.${TARGET_NAME}/tini-static ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/docker-init } + +post_install_addon() { + sed -e "s/@DISTRO_PKG_SETTINGS_ID@/${DISTRO_PKG_SETTINGS_ID}/g" -i "${INSTALL}/default.py" +} diff --git a/packages/addons/service/docker/source/default.py b/packages/addons/service/docker/source/default.py index 912056d088..75925825f6 100644 --- a/packages/addons/service/docker/source/default.py +++ b/packages/addons/service/docker/source/default.py @@ -10,7 +10,7 @@ import xbmc import xbmcaddon import xbmcgui -sys.path.append('/usr/share/kodi/addons/service.libreelec.settings') +sys.path.append('/usr/share/kodi/addons/@DISTRO_PKG_SETTINGS_ID@') import oe __author__ = 'lrusak'