Skip to content

Conversation

@stangri
Copy link
Member

@stangri stangri commented Dec 29, 2025

Maintainer: me
Compile tested: x86_64, Dell EMC Edge 620, OpenWrt 24.10.4
Run tested: x86_64, Dell EMC Edge 620, OpenWrt 24.10.4

Description:
Makefile:

  • remove traces of variants and simplify

Init-script:

  • introduce prefixlength option to speed up tables operations (thanks @egc112)

@libiunc
Copy link
Contributor

libiunc commented Dec 29, 2025

Could you also fix this circular dependency issue while you're at it?

    conflicts: pbr-1.2.1-r41[pbr=1.2.1-r41]
    satisfies: world[pbr] luci-app-pbr-1.2.0-r2[pbr]
make[2]: *** [package/Makefile:100: package/install] Error 14

net/pbr/Makefile Outdated
$(call Package/pbr/default/description)
This version supports OpenWrt (23.05 and newer) with firewall4/nft.
This service enables policy-based routing for WAN interfaces and various VPN tunnels.
This version supports OpenWrt (23.05 and newer) with firewall4/nft.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this supports 23.05 and newer, shouldn't be there provides for vpn-policy-routing and vpnbypass?

To fix https://forum.turris.cz/t/problem-po-automaticke-aktualizaci-routeru-turris-omnia-wi-fi-6/22238 (sorry only in Czech), basically issue is that users have installed vpn-policy-routing and while going from ancient OpenWrt version to OpenWrt 24.10, the package is gone as it was removed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PROVIDES for vpnbypass and vpn-policy-routing was removed from the Makefile in August 2024, by then it's been two years since pbr replaced vpnbypass and vpn-policy-routing in OpenWrt packages repos (starting with 22.03 branch).

While a lot of effort has been made to ensure transition from the vpn-policy-routing to iptables-capable version of pbr back in the day, for the current version of pbr, which relies not only on nft, but fw4 nft files, there's no upgrade path from vpn-policy-routing to pbr. The README for pbr 1.2.0 (most recent in the stable branch): https://docs.openwrt.melmac.ca/pbr/#version-120 clearly states there's no upgrade path.

If user were to search for the vpn-policy-routing README, it mentions the pbr as a replacement package: https://docs.openwrt.melmac.ca/vpn-policy-routing/

Without pbr flavours it's easier to reinstate PROVIDES for the obsolete packages, I'm just not sure if it's worth the electrons to even mention packages which have been obsolete for almost 4 years.

Makefile:
* remove traces of variants and simplify
* more sensible DEPENDS section (thanks @BKPepe)

Init-script:
* introduce prefixlength option to speed up tables operations (thanks @egc112)

Signed-off-by: Stan Grishin <[email protected]>
@stangri
Copy link
Member Author

stangri commented Jan 3, 2026

@BKPepe I seem to have overcome the IDE and now the Makefile has proper spaces/tabs, based on your comments and the Makefile for bind from this repo.

@stangri stangri merged commit 89ef3e2 into openwrt:master Jan 9, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants