Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <stijn@linux-ipv6.be> Reviewed-by: Jo-Philipp Wich <jo@mein.io>
- Loading branch information
53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use copy-paste next time. Now I cannot copy-paste the error in the commit message. Also this is not the commit that introduced the problem.
53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
openwrt/include/target.mk
Line 57 in 53b87a7
This line should probably change also from
firewalltouci-firewallas in openwrt/luci@48599d8Otherwise, if we try to build an LuCI-included image with image builder, package
luciwill resolve tofirewall4, conflicting withfirewallwhich is listed as one of the default router packages.53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kuanyili Thanks. I can approve.
53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I doubt this is the correct solution, as it would make the default package selection unpredictable. Surely we don't want that.
53b87a7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. This was also my concern. There is currently no way to set package precedence.
Not sure if there is a better approach but for those who are interested, I'm working around the conflict by explicitly specifying the desired firewall package before any package that triggers a
uci-firewalldependency resolution.More specifically, I'm doing something like
PACKAGES="firewall luci"to selectfirewall(firewallmust be placed beforeluci)PACKAGES="-firewall firewall4 luci"to selectfirewall4while running image builder for the time being.