aboutsummaryrefslogtreecommitdiff
path: root/net/sqm-scripts
Commit message (Collapse)AuthorAge
* treewide: refresh hashes after move to use ZSTD as defaultRobert Marko2024-04-07
| | | | | | | | With the recent move to using ZSTD as the default compression format for packaging git repo clones we must refresh all of the hashes for the packages feed as well. Signed-off-by: Robert Marko <robimarko@gmail.com>
* sqm-scripts: Bump to v1.6.0Toke Høiland-Jørgensen2023-08-22
| | | | | | Fixes an issue with DSA switch compatibility Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* treewide: remove AUTORELEASEPaul Fertser2023-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically compute and substitute current values for all $(AUTORELEASE) instances as this feature is deprecated and shouldn't be used. The following temporary change was made to the core: diff --git a/rules.mk b/rules.mk index 57d7995d4fa8..f16367de87a8 100644 --- a/rules.mk +++ b/rules.mk @@ -429,7 +429,7 @@ endef abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1)))) COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) +AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) all: FORCE: ; And this command used to fix affected packages: for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \ sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/$i/download done Signed-off-by: Paul Fertser <fercerpav@gmail.com>
* sqm-scripts: Bump to v1.5.2Toke Høiland-Jørgensen2022-08-24
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: switch back to iptablesEtienne Champetier2022-03-02
| | | | | | | | | Following recent dependency rework, we can switch between iptables-legacy and iptables-nft, and they both PROVIDES iptables. Make it easier for user that want/need to stick to firewall3/iptables-legacy to do so. Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
* sqm-scripts: Change iptables dependency to iptables-nftToke Høiland-Jørgensen2022-02-01
| | | | | | | | | | There's only one of the shaper scripts (simple.qos) that uses iptables, and it should be fine with iptables-nft for compatibility with the new default nft-based firewall. Confusingly, we still need the iptables-mod-ipopt package to get the DSCP match module; we never used CONNMARK, though, so drop the iptables-mod-conntrack-extra dependency while we're at it. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: drop redundant dependencyRui Salvaterra2021-12-17
| | | | | | | | | The kmod-sched-cake package already depends on kmod-sched-core, there's no need for explicitly stating the dependency. While at it, change PKG_RELEASE to $(AUTORELEASE). Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
* sqm-scripts: bump to v1.5.1Toke Høiland-Jørgensen2021-08-13
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Update PKG_MIRROR_HASHToke Høiland-Jørgensen2020-12-31
| | | | | | | Forgot to update the MIRROR_HASH Fixes: 2c652128c52e: ("sqm-scripts: Bump to v1.5.0") Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.5.0Toke Høiland-Jørgensen2020-12-31
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: depend directly on kmod-sched-cake againAdrian Schmutzler2020-08-31
| | | | | | | | | | | Since support for kernel 4.14 has been removed, kmod-sched-cake-oot is gone, and the kmod-sched-cake-virtual package is not needed anymore. This effectively reverts 9114244fbd1b ("sqm-scripts: Switch sch_cake dependency to new virtual package") Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* sqm-scripts: Switch sch_cake dependency to new virtual packageToke Høiland-Jørgensen2020-05-06
| | | | | | | | | | | As reported in https://github.com/openwrt/packages/issues/12072, the imagebuilder fails due to a dependency resolution error when the userspace packages are built using a target that has a different kernel version than that which is being run. To resolve this, move the sqm-scripts dependency to a new virtual package, which hopefully should be consistent with the actual kernel module being built. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: move luci-app-sqm to the LuCI feedHannu Nyman2020-04-03
| | | | | | | Move luci-app-sqm to the LuCI feed to enable it to be translated. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* sqm-scripts: support in & out of tree cake packagesKevin Darbyshire-Bryant2020-04-01
| | | | | | | | | Change dependency requirements based on kernel version. Ultimately in a post Linux 4_14 world the differentation can be removed. In the short term this allows post 4_14 kernels to use in-tree versions of the cake shaper. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
* sqm-scripts: luci-app-sqm: init ucitrack with uci-defaultsYousong Zhou2020-03-01
| | | | | | | | | To avoid build failure when luci-app-sqm is selected as builtin where the ipk will be installed on build machine While at it, switch to using $(MAKE) instead of plain "make" Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* sqm-scripts: fix hash and simplify Makefile slightlyRosen Penev2020-02-06
| | | | | | | | The previous commit required the hash to be updated. Removed a bunch of redundant variables. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* luci-app-sqm: Remove lua and luci-base dependenciesToke Høiland-Jørgensen2020-01-17
| | | | | | | | | | We depend on luci-compat now, which will pull in luci-base, which in turn will pull in lua. So remove those two dependencies to maybe help with recursive dependency resolution errors. Fixes #5320. Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
* sqm-scripts: Add required new depends for luci-app-sqmZachary Cook2019-11-04
| | | | | | | The new luci-compat package is required to be able to run luci-app-sqm, see: https://github.com/openwrt/luci/commit/d5dff8f9a5ca85d197cbb6037f95053bc55941e5 Signed-off-by: Zachary Cook <zachcook1991@gmail.com>
* sqm-scripts: Bump to v1.4.0Toke Høiland-Jørgensen2019-09-14
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.3.0Toke Høiland-Jørgensen2019-01-21
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
* sqm-scripts: select luci-base instead of depending on itJo-Philipp Wich2018-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently luci-app-sqm provided by sqm-scripts depends on luci-base instead of selecting it, this leads to an indirect circular dependency in kconfig: tmp/.config-package.in:34646:error: recursive dependency detected! For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:34646: symbol PACKAGE_iptables is selected by PACKAGE_sqm-scripts For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:961: symbol PACKAGE_sqm-scripts is selected by PACKAGE_luci-app-sqm For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:22421: symbol PACKAGE_luci-app-sqm depends on PACKAGE_luci-base For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:21387: symbol PACKAGE_luci-base is selected by PACKAGE_luci-lib-iptparser For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:22899: symbol PACKAGE_luci-lib-iptparser is selected by PACKAGE_luci-app-splash For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:22402: symbol PACKAGE_luci-app-splash is selected by PACKAGE_luci-mod-freifunk-community For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:21552: symbol PACKAGE_luci-mod-freifunk-community depends on PACKAGE_iptables Solve the issue by turning the dependencies into selecting ones which also matches the behaviour of other LuCI applications. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* sqm-scripts: Bump to v1.2.4Toke Høiland-Jørgensen2018-08-28
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.2.3Toke Høiland-Jørgensen2018-06-05
| | | | | | Fixes an issue with sqm-scripts not being reloaded on ifup/down. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.2.2Toke Høiland-Jørgensen2018-05-06
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Another bump to v1.2.1Toke Høiland-Jørgensen2018-05-02
|
* sqm-scripts: Bump to v1.2.0Toke Høiland-Jørgensen2018-05-02
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Fix return value bug in postrm scriptTony Ambardar2018-03-01
| | | | | | | | | The script removes the UCI option ucitrack.@sqm[0] if present and then returns success. If that UCI option is already absent however, the script incorrectly returns failure, which blocks upgrade of the luci-app-sqm package. Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
* treewide: run "make check FIXUP=1"Etienne Champetier2017-08-29
| | | | | | | | | | fix Makefile chmod (644) replace MD5SUM with HASH add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git (PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now) Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
* sqm-scripts: Bump to v1.1.3Toke Høiland-Jørgensen2017-02-03
|
* sqm-scripts: Bump to v1.1.2, depend on kmod-sched-coreToke Høiland-Jørgensen2017-01-29
| | | | | | | The needed shaper modules are now in kmod-sched-core, so we don't need to depend on the full kmod-sched anymore. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.1.1, depend on kmod-sched-cakeToke Høiland-Jørgensen2017-01-22
| | | | | | The kmod-sched-cake dependency is to avoid Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Update to v1.1.0Toke Høiland-Jørgensen2017-01-03
|
* sqm-scripts: use https link (#3741)Alberto Bursi2017-01-03
| | | | | | | change download link from git:// to https:// . Git links are less safe (not encrypted) and, more importantly, they are blocked by company firewalls. Https links do not have either issue. Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
* sqm-scripts: Bump to v1.0.9Toke Høiland-Jørgensen2016-11-19
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.8.Toke Høiland-Jørgensen2016-10-02
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.7.Toke Høiland-Jørgensen2016-02-16
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.6.Toke Høiland-Jørgensen2015-12-09
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Drop dependency on 'ip'.Toke Høiland-Jørgensen2015-11-19
|
* sqm-scripts: Bump to v1.0.5.Toke Høiland-Jørgensen2015-11-19
|
* sqm-scripts: Bump to v1.0.4.Toke Høiland-Jørgensen2015-11-02
|
* sqm-scripts: Bump to v1.0.3.Toke Høiland-Jørgensen2015-09-03
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.2.Toke Høiland-Jørgensen2015-08-26
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.1.Toke Høiland-Jørgensen2015-08-17
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Fix dependency on tc.Toke Høiland-Jørgensen2015-08-14
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Bump to v1.0.Toke Høiland-Jørgensen2015-08-06
| | | | | | | | sqm-scripts and luci-app-sqm now live in the same Makefile and are built from the upstream git repository, rather than having the files included here. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* sqm-scripts: Default to ECN on for egress.Toke Høiland-Jørgensen2015-07-12
| | | | Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
* [SQM] Fix simple.qos to allow using cake as ingress shaperSebastian Moeller2015-07-12
| | | | | | | | | | simple.qos had accidentally set up the egress shaper twice, once with the true egress parameters and a second time using the ingress parameters, effectively misconfiguring both directions. This bub only affected situations where 3-tier ingress classification was used. Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
* [SQM] Fix sqm_logger to accept empty strings as inputSebastian Moeller2015-07-12
| | | | | | | | sqm_logger tried tro wait indefinitely if passed an empty string. This in turn makes sqm-scripts hang. Quoting the input argument in sqm_logger seems to fix the problem. Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
* [SQM] Fix changes relating to cake lnk layer adjustmentsSebastian Moeller2015-07-12
| | | | | | | | | | | The last batch of changes tried to teach the GUI to pass link layer options to cake but forgot to actually call the function that parses the GUI variables and used it as a string insteead. So this fixes that it also tries to allow the use of the tc_stab link layer adjustment method with cake so the implementations can be validated against each other easily. Needs testing... Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
* [SQM/luci-app-sqm] Wire up link layer dandling for cakeSebastian Moeller2015-07-12
| | | | | | | | | | | | | The cake traffic-shaper qdisc omne stop solution knows how to handle link layer adjustments for ATM and can account for per packet overhead. This commit adds cake as link layer adjustment mechanism in the GUI and passes numerically specified overhead as well as the ATM linklayer keywords on to cake. This change also passes the "advanced option strings" from the Queue Discipline tab to cake. But as before no error checking. This needs testing, as I have no working cake qdisc available so caveat emptor... Signed-off-by: Sebastian Moeller <moeller0@gmx.de>