| Message ID | 20200401101423.8618-1-ldir@darbyshire-bryant.me.uk |
|---|---|
| Headers | show |
| Series | Moving to drop Out of tree cake | expand |
Kevin Darbyshire-Bryant kirjoitti 1.4.2020 klo 13.14: > Cake has been in upstream linux from 4.19 onward yet openwrt still > builds a module from out of tree source. This patch set intends to drop > the out of tree module for those versions of linux that contain an > in-tree version + various backports of upstream enhancements. > > Unfortunately it's not as simple as just renaming a package and adding > PROVIDES due to some issues with PROVIDES handling. So the dependency > handling has to be handled in the depending package. > > To be read in combination with: > https://github.com/ldir-EDB0/packages/commit/1ec73d60da31c13b05c36d5fca2a062bc9bce071 > I succeeded in having the correct dependencies (with also your SQM dependency change): in-tree cake for 4.19 in ipq806x and out-of-tree cake for 4.14 ar71xx with the following change to your commits: I added kmod-ipt-conntrack dependency to kmod-sched-cake-oot to avoid a "missing dependency" error at compilation --- a/package/kernel/kmod-sched-cake-oot/Makefile +++ b/package/kernel/kmod-sched-cake-oot/Makefile @@ -26,7 +26,7 @@ define KernelPackage/sched-cake-oot URL:=https://github.com/dtaht/sch_cake FILES:=$(PKG_BUILD_DIR)/sch_cake.ko AUTOLOAD:=$(call AutoLoad,75,sch_cake) - DEPENDS:=@LINUX_4_14 +kmod-sched-core + DEPENDS:=@LINUX_4_14 +kmod-sched-core +kmod-ipt-conntrack endef include $(INCLUDE_DIR)/kernel-defaults.mk That change enabled the compilation in ar71xx with 4.14. Otherwise the changes look ok, and SQM picks up the correct cake variant based on target's kernel.
Cake has been in upstream linux from 4.19 onward yet openwrt still builds a module from out of tree source. This patch set intends to drop the out of tree module for those versions of linux that contain an in-tree version + various backports of upstream enhancements. Unfortunately it's not as simple as just renaming a package and adding PROVIDES due to some issues with PROVIDES handling. So the dependency handling has to be handled in the depending package. To be read in combination with: https://github.com/ldir-EDB0/packages/commit/1ec73d60da31c13b05c36d5fca2a062bc9bce071 Kevin Darbyshire-Bryant (2): kmod-sched-cake: rename to kmod-sched-cake-oot kmod-sched-cake: switch to in-tree cake for 4.19+ .../Makefile | 12 +- package/kernel/linux/modules/netsupport.mk | 17 +- ...-sch_cake-Make-the-dual-modes-fairer.patch | 217 ++++++++++++++++++ ...-use-of-connmarks-as-tin-classifiers.patch | 118 ++++++++++ ...erpret-fwmark-parameter-as-a-bitmask.patch | 102 ++++++++ ...rop-unused-variable-tin_quantum_prio.patch | 158 +++++++++++++ ...sing-NLA-policy-entry-TCA_CAKE_SPLIT.patch | 30 +++ 7 files changed, 647 insertions(+), 7 deletions(-) rename package/kernel/{kmod-sched-cake => kmod-sched-cake-oot}/Makefile (76%) create mode 100644 target/linux/generic/backport-4.19/392-v5.1-sch_cake-Make-the-dual-modes-fairer.patch create mode 100644 target/linux/generic/backport-4.19/393-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch create mode 100644 target/linux/generic/backport-4.19/394-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch create mode 100644 target/linux/generic/backport-4.19/395-v5.4-sch_cake-drop-unused-variable-tin_quantum_prio.patch create mode 100644 target/linux/generic/backport-4.19/396-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch