config/functions: only use PKG_ADDON_ID for install_binary_addon

Usage of PKG_NAME was a bug carried over from the original code
during refactoring. Since none of the addons set PKG_SECTION, and
therefore PKG_NAME and PKG_ADDON_ID were identical, this wasn't
noticed before.

Drop using PKG_NAME and only use PKG_ADDON_ID to fix this,
install_binary_addon can then also be used for addons which set
PKG_SECTION.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2017-09-05 09:17:30 +02:00
parent 2fc261ae8e
commit 4b14c6c946
4 changed files with 6 additions and 6 deletions

View File

@ -182,14 +182,14 @@ get_pkg_variable() {
}
install_binary_addon() {
local addon_name="$1" addon_id="$2" addon_so
local addon_id="$1" addon_so
mkdir -p $ADDON_BUILD/$addon_id/
cp -R $PKG_BUILD/.install_pkg/usr/share/$MEDIACENTER/addons/$addon_name/* $ADDON_BUILD/$addon_id/
cp -R $PKG_BUILD/.install_pkg/usr/share/$MEDIACENTER/addons/$addon_id/* $ADDON_BUILD/$addon_id/
addon_so=$(xmlstarlet sel -t -v "/addon/extension/@library_linux" $ADDON_BUILD/$addon_id/addon.xml)
if [ -n "$addon_so" ]; then
cp -L $PKG_BUILD/.install_pkg/usr/lib/$MEDIACENTER/addons/$addon_name/$addon_so $ADDON_BUILD/$addon_id/
cp -L $PKG_BUILD/.install_pkg/usr/lib/$MEDIACENTER/addons/$addon_id/$addon_so $ADDON_BUILD/$addon_id/
chmod +x $ADDON_BUILD/$addon_id/$addon_so
fi
}

View File

@ -30,7 +30,7 @@ PKG_LONGDESC="inputstream.adaptive"
PKG_IS_ADDON="yes"
addon() {
install_binary_addon $PKG_NAME $PKG_ADDON_ID
install_binary_addon $PKG_ADDON_ID
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
cp -P $PKG_BUILD/.$TARGET_NAME/wvdecrypter/libssd_wv.so $ADDON_BUILD/$PKG_ADDON_ID

View File

@ -41,7 +41,7 @@ addon() {
for _ADDON in $PKG_BUILD/.install_pkg/usr/share/$MEDIACENTER/addons/* ; do
_ADDON_ID=$(basename $_ADDON)
install_binary_addon $_ADDON_ID $_ADDON_ID
install_binary_addon $_ADDON_ID
MULTI_ADDONS="$MULTI_ADDONS $_ADDON_ID"
done

View File

@ -101,7 +101,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
if [ "$(type -t addon)" = "function" ]; then
addon
else
install_binary_addon $PKG_NAME $PKG_ADDON_ID
install_binary_addon $PKG_ADDON_ID
fi
# HACK for packages that provide multiple addons like screensavers.rsxs