nginx: drop nginx dummy packages
Enough transition period has passed for nginx dummy package. Finally drop it for good and add Provides for nginx default. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
parent
329d7e4f78
commit
ad14af942c
|
@ -98,8 +98,7 @@ define Package/nginx/default
|
|||
TITLE:=Nginx web server
|
||||
URL:=http://nginx.org/
|
||||
DEPENDS:=+libopenssl +libpthread
|
||||
# TODO: add PROVIDES when removing nginx
|
||||
# PROVIDES:=nginx
|
||||
PROVIDES:=nginx
|
||||
endef
|
||||
|
||||
define Package/nginx/description
|
||||
|
@ -512,31 +511,3 @@ $(eval $(call BuildModule,geoip2,+@NGINX_STREAM_CORE_MODULE +nginx-mod-stream +l
|
|||
Enable MaxMind GeoIP2 module.))
|
||||
$(eval $(call BuildModule,njs,+zlib +libxml2 +libxslt +libpcre2,ngx_http_js, \
|
||||
Enable NJS module.))
|
||||
|
||||
# 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
|
||||
# respectively nginx-mod-luci). Add above commented PROVIDES when removing.
|
||||
|
||||
define Package/nginx
|
||||
TITLE:=Dummy package for transition when upgrading.
|
||||
DEPENDS:=+nginx-ssl
|
||||
PKGARCH:=all
|
||||
endef
|
||||
|
||||
define Package/nginx/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,nginx))
|
||||
|
||||
define Package/nginx-mod-luci-ssl
|
||||
TITLE:=Dummy package for transition when upgrading.
|
||||
DEPENDS:=+nginx-mod-luci
|
||||
PKGARCH:=all
|
||||
endef
|
||||
|
||||
define Package/nginx-mod-luci-ssl/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,nginx-mod-luci-ssl))
|
||||
|
|
Loading…
Reference in New Issue