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.
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
