From 921321fe1dc814049ecfa1b9b44d79c0f10ac5d6 Mon Sep 17 00:00:00 2001 From: Ryan Keane Date: Wed, 13 Nov 2024 04:31:44 -0800 Subject: [PATCH] nginx: Support APK versioning Modify EXTRA_DEPENDS in package section to meet APK packaging requirements. Signed-off-by: Ryan Keane [ fix dependency also for nginx-full ] Signed-off-by: Christian Marangi (cherry picked from commit ea5536c14c35cdaa49d97a0f70695147a538f521) --- net/nginx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/nginx/Makefile b/net/nginx/Makefile index c4a81986b3..a96dd0b70a 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -117,7 +117,7 @@ define Package/nginx-ssl DEPENDS+= +NGINX_PCRE:libpcre2 \ +NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \ +NGINX_HTTP_GZIP:zlib +NGINX_DAV:libxml2 - EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1) + EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-r1) CONFLICTS:=nginx-full endef @@ -165,7 +165,7 @@ define Package/nginx-full $(Package/nginx/default) TITLE += with ALL config selected DEPENDS+=+libpcre2 +nginx-ssl-util +zlib +libxml2 - EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1) + EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-r1) VARIANT:=full PROVIDES += nginx-ssl endef -- 2.30.2