Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12953 from peter-stadler/patch-1

Browse source 
nginx: remove PROVIDES on depending package
This commit is contained in:
Rosen Penev 2020-07-27 14:37:52 -07:00 committed by GitHub
commit f4897d2ae8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/nginx/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.19.1 PKG_VERSION:=1.19.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/ PKG_SOURCE_URL:=https://nginx.org/download/
@ -305,7 +305,8 @@ define Package/nginx-mod-luci
TITLE:=Support file for Nginx TITLE:=Support file for Nginx
URL:=http://nginx.org/ URL:=http://nginx.org/
DEPENDS:=+uwsgi +uwsgi-luci-support +nginx DEPENDS:=+uwsgi +uwsgi-luci-support +nginx
PROVIDES:=nginx-mod-luci-ssl # TODO: add PROVIDES when removing nginx-mod-luci-ssl
# PROVIDES:=nginx-mod-luci-ssl
endef endef
define Package/nginx-mod-luci/description define Package/nginx-mod-luci/description
@ -547,7 +548,7 @@ $(eval $(call BuildPackage,nginx-mod-luci))
# TODO: remove after a transition period (together with pkg nginx-util): # TODO: remove after a transition period (together with pkg nginx-util):
# It is for smoothly substituting nginx and nginx-mod-luci-ssl (by nginx-ssl # It is for smoothly substituting nginx and nginx-mod-luci-ssl (by nginx-ssl
# respectively nginx-mod-luci). # respectively nginx-mod-luci). Add above commented PROVIDES when removing.
Package/nginx = $(Package/nginx-ssl) Package/nginx = $(Package/nginx-ssl)