From a044fa26068d00c7f4f87e5e20ceda5f2878c753 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 23 Oct 2024 18:47:06 +0200 Subject: [PATCH] nginx-util: drop nginx-util dummy packages Enough transition period has passed for nginx-util dummy package. Finally drop it for good and drop the extra dependency. Signed-off-by: Christian Marangi (cherry picked from commit b75050d59e40255c69873f25123061cac240542b) --- net/nginx-util/Makefile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index d52ca54231..e695809b3b 100644 --- a/net/nginx-util/Makefile +++ b/net/nginx-util/Makefile @@ -17,10 +17,6 @@ define Package/nginx-ssl-util/default SUBMENU:=Web Servers/Proxies TITLE:=Nginx configurator including SSL DEPENDS:=+libstdcpp +libuci +libubus +libubox +libpthread +libopenssl - # TODO: remove after a transition period (together with below and pkg nginx): - # It actually removes nginx-util (replacing it by a dummy pkg) to avoid - # conflicts with nginx-ssl-util* - DEPENDS+= +nginx-util EXTRA_DEPENDS:=nginx-util (>=1.4-2) endef @@ -128,19 +124,3 @@ Package/nginx-ssl-util-nopcre/conffiles = $(Package/nginx-ssl-util/conffiles) $(eval $(call BuildPackage,nginx-ssl-util)) $(eval $(call BuildPackage,nginx-ssl-util-nopcre)) - - -# TODO: remove after a transition period (together with above and pkg nginx): -# It replaces nginx-util by a dummy pkg for a smooth upgrade of nginx* - -define Package/nginx-util - TITLE:=Dummy package for removing nginx-util when upgrading. - DEPENDS:=+libstdcpp +libubus +libubox +libpthread - PKGARCH:=all -endef - -define Package/nginx-util/install - $(INSTALL_DIR) $(1)/usr/bin -endef - -$(eval $(call BuildPackage,nginx-util))