Browse Source

nginx-util: resolve recursive CONFLICTS

Plus change the TITLE that it fits.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
lilik-openwrt-22.03
Peter Stadler 5 years ago
parent
commit
d5dcbc3898
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      net/nginx-util/Makefile

+ 6
- 6
net/nginx-util/Makefile View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx-util PKG_NAME:=nginx-util
PKG_VERSION:=1.3 PKG_VERSION:=1.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at> PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -15,27 +15,27 @@ define Package/nginx-util/default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
TITLE:=Builder of LAN listen directives for Nginx
TITLE:=Nginx configurator
DEPENDS:=+libstdcpp +libubus +libubox +libpthread DEPENDS:=+libstdcpp +libubus +libubox +libpthread
endef endef
define Package/nginx-util define Package/nginx-util
$(Package/nginx-util/default) $(Package/nginx-util/default)
CONFLICTS:=nginx-ssl-util
CONFLICTS:=nginx-ssl-util-nopcre nginx-ssl-util
endef endef
define Package/nginx-ssl-util/default define Package/nginx-ssl-util/default
$(Package/nginx-util/default) $(Package/nginx-util/default)
TITLE+= and manager of its SSL certificates
TITLE+= including SSL
DEPENDS+= +libopenssl DEPENDS+= +libopenssl
CONFLICTS:=nginx-util
CONFLICTS:=,nginx-util
endef endef
define Package/nginx-ssl-util define Package/nginx-ssl-util
$(Package/nginx-ssl-util/default) $(Package/nginx-ssl-util/default)
TITLE+= (using PCRE) TITLE+= (using PCRE)
DEPENDS+= +libpcre DEPENDS+= +libpcre
CONFLICTS+= nginx-ssl-util-nopcre
CONFLICTS+= ,nginx-ssl-util-nopcre
endef endef
define Package/nginx-ssl-util-nopcre define Package/nginx-ssl-util-nopcre


Loading…
Cancel
Save