Merge pull request #5251 from HiassofT/le10-kodi-service-addons

Revert "kodi: service addon wrapper call fix"
This commit is contained in:
CvH 2021-03-20 10:21:27 +01:00 committed by GitHub
commit b0ae8b2ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions

View File

@ -17,8 +17,8 @@
+ case LE_ADDON_DISABLED:
+ contextStr = "disable";
+ break;
+ case LE_ADDON_POST_UPDATE:
+ contextStr = "post-update";
+ case LE_ADDON_POST_INSTALL:
+ contextStr = "post-install";
+ break;
+ case LE_ADDON_PRE_UNINSTALL:
+ contextStr = "pre-uninstall";
@ -38,13 +38,12 @@
void OnPreInstall(const AddonPtr& addon)
{
//Fallback to the pre-install callback in the addon.
@@ -409,6 +440,9 @@ void OnPostInstall(const AddonPtr& addon
@@ -409,6 +440,8 @@ void OnPostInstall(const AddonPtr& addon
}
closedir(addonsDir);
}
+
+ if (update)
+ LEAddonHook(addon, LE_ADDON_POST_UPDATE);
+ LEAddonHook(addon, LE_ADDON_POST_INSTALL);
// OE
addon->OnPostInstall(update, modal);
@ -66,7 +65,7 @@
+typedef enum {
+ LE_ADDON_ENABLED,
+ LE_ADDON_DISABLED,
+ LE_ADDON_POST_UPDATE,
+ LE_ADDON_POST_INSTALL,
+ LE_ADDON_PRE_UNINSTALL,
+} LE_ADDON_CONTEXT;
+

View File

@ -29,8 +29,8 @@ if [ -f "${SERVICE_FILE}" ] ; then
systemctl stop "${ADDON_ID}.service"
systemctl disable "${ADDON_ID}.service"
;;
post-update)
# post-update is triggered on update,
post-install)
# post-install is triggered on update as well,
# make sure to stop and re-install service
systemctl stop "${ADDON_ID}.service"
systemctl disable "${ADDON_ID}.service"
@ -77,7 +77,7 @@ if [ -d "${OVERLAY_PATH}" ] ; then
OVERLAY_CONF="/storage/.cache/kernel-overlays/50-${ADDON_ID}.conf"
case "${CONTEXT}" in
enable | post-update )
enable | post-install )
create_overlay_conf
;;
disable | pre-uninstall )