Merge pull request #20166 from stangri/master-pbr

pbr: add provides: pbr to variants
This commit is contained in:
Stan Grishin 2023-01-03 12:45:29 -07:00 committed by GitHub
commit a7e01f2df8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pbr PKG_NAME:=pbr
PKG_VERSION:=1.0.1 PKG_VERSION:=1.0.1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
@ -20,7 +20,6 @@ define Package/pbr/default
URL:=https://docs.openwrt.melmac.net/pbr/ URL:=https://docs.openwrt.melmac.net/pbr/
DEPENDS:=+ip-full +jshn +jsonfilter +resolveip DEPENDS:=+ip-full +jshn +jsonfilter +resolveip
CONFLICTS:=vpnbypass vpn-policy-routing CONFLICTS:=vpnbypass vpn-policy-routing
PROVIDES:=vpnbypass vpn-policy-routing
PKGARCH:=all PKGARCH:=all
endef endef
@ -28,17 +27,20 @@ define Package/pbr
$(call Package/pbr/default) $(call Package/pbr/default)
TITLE+= with nft/nft set support TITLE+= with nft/nft set support
DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json
PROVIDES:=vpnbypass vpn-policy-routing
endef endef
define Package/pbr-iptables define Package/pbr-iptables
$(call Package/pbr/default) $(call Package/pbr/default)
TITLE+= with iptables/ipset support TITLE+= with iptables/ipset support
DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt
PROVIDES:=pbr vpnbypass vpn-policy-routing
endef endef
define Package/pbr-netifd define Package/pbr-netifd
$(call Package/pbr/default) $(call Package/pbr/default)
TITLE+= with netifd support TITLE+= with netifd support
PROVIDES:=pbr vpnbypass vpn-policy-routing
endef endef
define Package/pbr/description define Package/pbr/description