From: Eric Fahlgren Date: Sun, 8 Mar 2026 16:57:57 +0000 (-0700) Subject: firewall4: prefer over firewall as dependency X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d71d9a4be811d6bb494fa79c23f792c00f0f005;p=thirdparty%2Fopenwrt.git firewall4: prefer over firewall as dependency When the virtual package "uci-firewall" is installed, the choice between "firewall" and "firewall4" is arbitrary, sometimes resulting in one, sometimes the other. Set the default variant on "firewall4" to make it the preferred package when installed as a dependency. Link: https://forum.openwrt.org/t/owut-openwrt-upgrade-tool/200035/1126 Signed-off-by: Eric Fahlgren Link: https://github.com/openwrt/openwrt/pull/22328 Signed-off-by: Hauke Mehrtens --- diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile index fd177850990..6ae34ea89af 100644 --- a/package/network/config/firewall4/Makefile +++ b/package/network/config/firewall4/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git @@ -28,6 +28,7 @@ define Package/firewall4 +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci EXTRA_DEPENDS:=ucode (>=2022.03.22) PROVIDES:=uci-firewall + DEFAULT_VARIANT:=1 endef define Package/firewall4/description