From cedc95c86234ced637fe94a1deb931fc2771dfe9 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 6 Mar 2022 12:44:10 +0100 Subject: [PATCH 1/2] haproxy: Makefile polishing - There should be shorter TITLE in Package/haproxy/Default otherwise it is not shown - No need to call Build/Prepare/Default - Remove twice TITLE in non-SSL variant - Make conffiles more clear - Remove empty menu for halog Signed-off-by: Josef Schlehofer --- net/haproxy/Makefile | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 628dc91ae..cfd356267 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -29,31 +29,25 @@ define Package/haproxy/Default SUBMENU:=Web Servers/Proxies SECTION:=net CATEGORY:=Network - TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer + TITLE:=TCP/HTTP Load Balancer URL:=https://www.haproxy.org/ endef -define Build/Prepare - $(call Build/Prepare/Default) -endef - -define Package/haproxy/Default/conffiles +define Package/haproxy/conffiles /etc/haproxy.cfg endef +Package/haproxy-nossl/conffiles = $(Package/haproxy/conffiles) + define Package/haproxy/Default/description Open source Reliable, High Performance TCP/HTTP Load Balancer. endef define Package/haproxy + $(call Package/haproxy/Default) + TITLE+=with SSL support DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic - TITLE+= (with SSL support) VARIANT:=ssl -$(call Package/haproxy/Default) -endef - -define Package/haproxy/conffiles -$(call Package/haproxy/Default/conffiles) endef define Package/haproxy/description @@ -62,19 +56,14 @@ $(call Package/haproxy/Default/description) endef define Package/haproxy-nossl - TITLE+= (without SSL support) + $(call Package/haproxy/Default) + TITLE+=without SSL support VARIANT:=nossl DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic - TITLE+= (without SSL support) -$(call Package/haproxy/Default) -endef - -define Package/haproxy-nossl/conffiles -$(call Package/haproxy/Default/conffiles) endef define Package/haproxy-nossl/description -$(call Package/haproxy/Default/description) + $(call Package/haproxy/Default/description) This package is built without SSL support. endef @@ -137,14 +126,13 @@ endef Package/haproxy-nossl/install = $(Package/haproxy/install) define Package/halog - MENU:=1 - $(call Package/haproxy) - TITLE+= halog - DEPENDS:=haproxy + $(call Package/haproxy) + TITLE+=halog + DEPENDS:=haproxy endef define Package/halog/description - HAProxy Log Analyzer + HAProxy Log Analyzer endef define Package/halog/install From 487cc8fb264090f07a6d04f148b46a79f8950d8e Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 6 Mar 2022 12:58:59 +0100 Subject: [PATCH 2/2] haproxy: add conflict to packages with SSL or without SSL support Both packages provide the same packages and should conflict to each other. Fixes: ``` Packages 'haproxy' and 'haproxy-nossl' do not conflict while providing same file: /usr/sbin/haproxy Packages 'haproxy' and 'haproxy-nossl' do not conflict while providing same file: /etc/haproxy.cfg Packages 'haproxy' and 'haproxy-nossl' do not conflict while providing same file: /etc/init.d/haproxy ``` They should not be installed side by side. Signed-off-by: Josef Schlehofer --- net/haproxy/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index cfd356267..d726b8454 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -60,6 +60,7 @@ define Package/haproxy-nossl TITLE+=without SSL support VARIANT:=nossl DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic + CONFLICTS:=haproxy endef define Package/haproxy-nossl/description