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

Merge pull request #18002 from BKPepe/haproxy-conflicts

Browse source 
haproxy: Makefile polishing and add conflict to SSL/non-SSL variant
This commit is contained in:
Josef Schlehofer 2022-03-14 10:03:31 +01:00 committed by GitHub
commit 94fb0da32c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
net/haproxy/Makefile
View file

@ -29,31 +29,25 @@ define Package/haproxy/Default
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer TITLE:=TCP/HTTP Load Balancer
URL:=https://www.haproxy.org/ URL:=https://www.haproxy.org/
endef endef
define Build/Prepare define Package/haproxy/conffiles
$(call Build/Prepare/Default)
endef
define Package/haproxy/Default/conffiles
/etc/haproxy.cfg /etc/haproxy.cfg
endef endef
Package/haproxy-nossl/conffiles = $(Package/haproxy/conffiles)
define Package/haproxy/Default/description define Package/haproxy/Default/description
Open source Reliable, High Performance TCP/HTTP Load Balancer. Open source Reliable, High Performance TCP/HTTP Load Balancer.
endef endef
define Package/haproxy define Package/haproxy
$(call Package/haproxy/Default)
TITLE+=with SSL support
DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic
TITLE+= (with SSL support)
VARIANT:=ssl VARIANT:=ssl
$(call Package/haproxy/Default)
endef
define Package/haproxy/conffiles
$(call Package/haproxy/Default/conffiles)
endef endef
define Package/haproxy/description define Package/haproxy/description
@ -62,19 +56,15 @@ $(call Package/haproxy/Default/description)
endef endef
define Package/haproxy-nossl define Package/haproxy-nossl
TITLE+= (without SSL support) $(call Package/haproxy/Default)
TITLE+=without SSL support
VARIANT:=nossl VARIANT:=nossl
DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic
TITLE+= (without SSL support) CONFLICTS:=haproxy
$(call Package/haproxy/Default)
endef
define Package/haproxy-nossl/conffiles
$(call Package/haproxy/Default/conffiles)
endef endef
define Package/haproxy-nossl/description define Package/haproxy-nossl/description
$(call Package/haproxy/Default/description) $(call Package/haproxy/Default/description)
This package is built without SSL support. This package is built without SSL support.
endef endef
@ -137,14 +127,13 @@ endef
Package/haproxy-nossl/install = $(Package/haproxy/install) Package/haproxy-nossl/install = $(Package/haproxy/install)
define Package/halog define Package/halog
MENU:=1 $(call Package/haproxy)
$(call Package/haproxy) TITLE+=halog
TITLE+= halog DEPENDS:=haproxy
DEPENDS:=haproxy
endef endef
define Package/halog/description define Package/halog/description
HAProxy Log Analyzer HAProxy Log Analyzer
endef endef
define Package/halog/install define Package/halog/install