nginx: Support APK versioning
authorRyan Keane <the.ra2.ifv@gmail.com>
Wed, 13 Nov 2024 12:31:44 +0000 (04:31 -0800)
committerChristian Marangi <ansuelsmth@gmail.com>
Wed, 13 Nov 2024 14:23:02 +0000 (15:23 +0100)
Modify EXTRA_DEPENDS in package section to meet APK packaging
requirements.

Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>
[ fix dependency also for nginx-full ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit ea5536c14c35cdaa49d97a0f70695147a538f521)

net/nginx/Makefile

index c4a81986b32b102b9cfd106399c40314683b1634..a96dd0b70a93494faf792f8818904da689e21d02 100644 (file)
@@ -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