diff --git a/config/functions b/config/functions index 58dee481be..f1d8c7af62 100644 --- a/config/functions +++ b/config/functions @@ -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 } diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index 358285b995..46f60affab 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -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 diff --git a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk index 6ab26bf66a..9e66c7ab39 100644 --- a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk @@ -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 diff --git a/scripts/create_addon b/scripts/create_addon index 777ad76c7a..89131d1e40 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -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