Skip to content

Commit

Permalink
kernel: Add kmod-sch-cake-virtual intermediate package
Browse files Browse the repository at this point in the history
As reported in openwrt/packages#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>
  • Loading branch information
tohojo authored and ldir-EDB0 committed Jun 6, 2020
1 parent 4e65838 commit 56db8e4
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions package/kernel/kmod-sched-cake-oot/Makefile
Expand Up @@ -29,14 +29,26 @@ define KernelPackage/sched-cake-oot
DEPENDS:=@LINUX_4_14 +kmod-sched-core +kmod-ipt-conntrack
endef

include $(INCLUDE_DIR)/kernel-defaults.mk

define KernelPackage/sched-cake/description
define KernelPackage/sched-cake-oot/description
O(ut) O(f) T(ree) Common Applications Kept Enhanced fq_codel/blue derived shaper
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
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
endef

$(eval $(call KernelPackage,sched-cake-oot))
$(eval $(call KernelPackage,sched-cake-virtual))

0 comments on commit 56db8e4

Please sign in to comment.