From 413c2b4f5f828f57740eac7ed150e4c7e8280a2e Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Tue, 19 Oct 2021 00:42:02 +0200 Subject: [PATCH] firewall/firewall4: provide uci-firewall Provide uci-firewall via PROVIDES in both firewall and firewall4. This will allow us to change the dependency of luci-app-firewall to uci-firewall, making it possible to use it with either implementation. Move CONFLICTS from firewall4 to firewall, to solve this recursive dependency problem: tmp/.config-package.in:307:error: recursive dependency detected! tmp/.config-package.in:307: symbol PACKAGE_firewall is selected by PACKAGE_firewall4 tmp/.config-package.in:328: symbol PACKAGE_firewall4 depends on PACKAGE_firewall Signed-off-by: Stijn Tintel Reviewed-by: Jo-Philipp Wich (cherry picked from commit 53b87a7a28525a634577f9215e2bb9170cf14dfb) --- package/network/config/firewall/Makefile | 2 ++ package/network/config/firewall4/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 1bf62c8fc2..ec15a11225 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -31,6 +31,8 @@ define Package/firewall DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables \ +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat \ +iptables-mod-fullconenat + PROVIDES:=uci-firewall + CONFLICTS:=firewall4 endef define Package/firewall/description diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile index 57af47062f..f5702adc6f 100644 --- a/package/network/config/firewall4/Makefile +++ b/package/network/config/firewall4/Makefile @@ -22,7 +22,7 @@ define Package/firewall4 CATEGORY:=Base system TITLE:=OpenWrt 4th gen firewall DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-uci +ucode-mod-ubus +kmod-nft-core +kmod-nft-fib +kmod-nft-nat +kmod-nft-nat6 +nftables-json - CONFLICTS:=firewall + PROVIDES:=uci-firewall endef define Package/firewall4/description