Skip to content

trafficshaper: avoid recursive dependency #30074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BKPepe merged 1 commit into from
Aug 3, 2026
Merged

trafficshaper: avoid recursive dependency #30074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions net/trafficshaper/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,39 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=trafficshaper
PKG_VERSION:=1.0.0
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>

PKG_LICENSE:=GPL-2.0-or-later

include $(INCLUDE_DIR)/package.mk

define Package/trafficshaper
define Package/trafficshaper/Default
SECTION:=net
CATEGORY:=Network
TITLE:=WAN traffic shaper based on LAN addresses
DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb \
+(PACKAGE_nftables-json||PACKAGE_nftables-nojson):nftables \
+!(PACKAGE_nftables-json||PACKAGE_nftables-nojson):iptables \
+(IPV6&&!(PACKAGE_nftables-json||PACKAGE_nftables-nojson)):ip6tables \
+kmod-sched-cake \
+!(PACKAGE_nftables-json||PACKAGE_nftables-nojson):iptables-mod-conntrack-extra
+kmod-sched-cake
PROVIDES:=trafficshaper
PKGARCH:=all
endef

define Package/trafficshaper
$(call Package/trafficshaper/Default)
TITLE+= (nftables)
DEPENDS+= +nftables
VARIANT:=nftables

@luizluca luizluca Jul 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not sure VARIANT works here as we don't have a build step. Anyway, it is, at most, innocuous.

DEFAULT_VARIANT:=1
endef

define Package/trafficshaper-iptables
$(call Package/trafficshaper/Default)
TITLE+= (iptables)
DEPENDS+= +iptables +IPV6:ip6tables +iptables-mod-conntrack-extra
VARIANT:=iptables
CONFLICTS:=trafficshaper
endef

define Package/trafficshaper/description
Setup QoS rules to limit (or reserve) traffic used by classes of clients.
Uplink and downlink can be controlled (or not controlled) independently.
Expand All @@ -36,10 +49,16 @@ define Package/trafficshaper/description
the use (or not) of spare wan bandwidth when available.
endef

define Package/trafficshaper-iptables/description
$(call Package/trafficshaper/description)
endef

define Package/trafficshaper/conffiles
/etc/config/trafficshaper
endef

Package/trafficshaper-iptables/conffiles = $(Package/trafficshaper/conffiles)

define Build/Compile
endef

Expand All @@ -50,4 +69,7 @@ define Package/trafficshaper/install
$(INSTALL_BIN) ./files/trafficshaper.init $(1)/etc/init.d/trafficshaper
endef

Package/trafficshaper-iptables/install = $(Package/trafficshaper/install)

$(eval $(call BuildPackage,trafficshaper))
$(eval $(call BuildPackage,trafficshaper-iptables))