From: Jeffery To Date: Mon, 6 Mar 2023 14:07:06 +0000 (+0800) Subject: fail2ban: Override Build/Compile instead of Py3Build/Compile X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cc09ec659757c0e12ba9256163494a6024327866;p=feed%2Fpackages.git 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 (cherry picked from commit 4195e5c4a8dcb0dfce8049e3e61844a3c1a90d67) --- diff --git a/net/fail2ban/Makefile b/net/fail2ban/Makefile index dd3d9b8cbd..aeb7e2dfc7 100644 --- a/net/fail2ban/Makefile +++ b/net/fail2ban/Makefile @@ -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))