Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: Add kmod-sch-cake-virtual intermediate package

Browse source 
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, add a virtual kernel package with
the conditional dependency currently used in sqm-scripts. The idea is to
move the sqm-scripts dependency to this 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>
This commit is contained in:
Toke Høiland-Jørgensen 2020-05-06 21:58:30 +02:00 committed by Kevin Darbyshire-Bryant
parent 4e65838871
commit 56db8e4615
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package/kernel/kmod-sched-cake-oot/Makefile
View file

@ -29,14 +29,26 @@ define KernelPackage/sched-cake-oot
DEPENDS:=@LINUX_4_14 +kmod-sched-core +kmod-ipt-conntrack DEPENDS:=@LINUX_4_14 +kmod-sched-core +kmod-ipt-conntrack
endef endef
include $(INCLUDE_DIR)/kernel-defaults.mk define KernelPackage/sched-cake-oot/description
define KernelPackage/sched-cake/description
O(ut) O(f) T(ree) Common Applications Kept Enhanced fq_codel/blue derived shaper O(ut) O(f) T(ree) Common Applications Kept Enhanced fq_codel/blue derived shaper
endef endef
define KernelPackage/sched-cake-virtual
SUBMENU:=Network Support
TITLE:=Virtual package for sched-cake
URL:=https://github.com/dtaht/sch_cake
DEPENDS:=+!LINUX_4_14:kmod-sched-cake +LINUX_4_14:kmod-sched-cake-oot
endef
define KernelPackage/sched-cake-virtual/description
Virtual package for resolving sch_cake dependencies
endef
include $(INCLUDE_DIR)/kernel-defaults.mk
define Build/Compile define Build/Compile
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
endef endef
$(eval $(call KernelPackage,sched-cake-oot)) $(eval $(call KernelPackage,sched-cake-oot))
$(eval $(call KernelPackage,sched-cake-virtual))