zabbix: remove unneeded postinsts

Handling uci-defaults scripts in package postinst is not needed in
modern OpenWrt and in fact results in error messages on install since
the common postinst processes and deletes uci-defaults scripts before
package-specific postinsts are executed.

Therefore remove the unneeded postinsts in this package.

Signed-off-by: Daniel F. Dickinson <redacted>

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 73b9501f0d87e13251063dae4fcbeed32435f587..15bda5b3a11cb778a5a04de1328c8d3174f07da0 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zabbix
 PKG_VERSION:=7.0.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/$(basename $(PKG_VERSION))/ \
@@ -498,12 +498,6 @@ define Package/zabbix-agentd/conffiles
 /etc/config/zabbix_agentd
 endef
 
-define Package/zabbix-agentd/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/90_zabbix_agentd) && rm -f /etc/uci-defaults/90_zabbix_agentd
-exit 0
-endef
-
 define Package/zabbix-agentd/install
        $(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
        $(INSTALL_DIR) $(1)/usr/share/zabbix_agentd.openwrt-params.d
@@ -517,7 +511,6 @@ define Package/zabbix-agentd/install
 endef
 
 Package/zabbix-agentd-basic/conffiles=$(call Package/zabbix-agentd/conffiles)
-Package/zabbix-agentd-basic/postinst=$(call Package/zabbix-agentd/postinst)
 
 define Package/zabbix-agentd-basic/install
        $(call Package/zabbix-agentd/install,$(1))
@@ -529,12 +522,6 @@ define Package/zabbix-proxy/conffiles
 /etc/config/zabbix_proxy
 endef
 
-define Package/zabbix-proxy/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/90_zabbix_proxy) && rm -f /etc/uci-defaults/90_zabbix_proxy
-exit 0
-endef
-
 define Package/zabbix-proxy/install
        $(INSTALL_DIR) $(1)/etc/zabbix_proxy.conf.d
        $(call Package/zabbix/install/sbin,$(1),proxy)
@@ -547,7 +534,6 @@ define Package/zabbix-proxy/install
 endef
 
 Package/zabbix-proxy-basic-sqlite/conffiles=$(call Package/zabbix-proxy/conffiles)
-Package/zabbix-proxy-basic-sqlite/postinst=$(call Package/zabbix-proxy/postinst)
 
 define Package/zabbix-proxy-basic-sqlite/install
        $(call Package/zabbix-proxy/install,$(1))
@@ -570,12 +556,6 @@ define Package/zabbix-server/install
        $(INSTALL_BIN) ./files/zabbix_server.defaults $(1)/etc/uci-defaults/90_zabbix_server
 endef
 
-define Package/zabbix-server/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/90_zabbix_server) && rm -f /etc/uci-defaults/90_zabbix_server
-exit 0
-endef
-
 define Package/zabbix-get/install
        $(call Package/zabbix/install/bin,$(1),get)
 endef