From 4195e5c4a8dcb0dfce8049e3e61844a3c1a90d67 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 6 Mar 2023 22:07:06 +0800 Subject: [PATCH] fail2ban: Override Build/Compile instead of Py3Build/Compile This allows changes to the Python build system apply more easily to the package. Signed-off-by: Jeffery To --- net/fail2ban/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/fail2ban/Makefile b/net/fail2ban/Makefile index 1d36a36d22..77568e9083 100644 --- a/net/fail2ban/Makefile +++ b/net/fail2ban/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fail2ban PKG_VERSION:=0.11.2 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fail2ban/fail2ban/tar.gz/$(PKG_VERSION)? @@ -48,6 +48,11 @@ define Package/fail2ban/conffiles /etc/config/fail2ban endef +define Build/Compile + cd $(PKG_BUILD_DIR) && ./fail2ban-2to3 + $(call Py3Build/Compile) +endef + define Py3Package/fail2ban/filespec +|$(PYTHON3_PKG_DIR) -|$(PYTHON3_PKG_DIR)/fail2ban/tests @@ -77,11 +82,6 @@ define Py3Package/fail2ban/install $(INSTALL_BIN) ./files/fail2ban.defaults $(1)/etc/uci-defaults/99_fail2ban endef -define Py3Build/Compile - cd $(PKG_BUILD_DIR) && ./fail2ban-2to3 - $(call Py3Build/Compile/Default) -endef - $(eval $(call Py3Package,fail2ban)) $(eval $(call BuildPackage,fail2ban)) $(eval $(call BuildPackage,fail2ban-src)) -- 2.30.2