RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-13 18:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
eb95ca3b5c
openwrt/package/kernel/kmod-sched-cake-oot/Makefile

55 lines
1.5 KiB
Makefile
Raw Normal View History

Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
#
# Copyright (C) 2016 LEDE
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
kmod-sched-cake: rename to kmod-sched-cake-oot In preparation for dropping the out of tree cake module and using in tree cake from upstream, rename the package to kmod-sched-cake-oot (out of tree) Initially add a PROVIDES kmod-sched-cake so that package dependencies can be satisfied. Ultimately this package will be removed when linux 4.14 is removed. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-30 17:52:09 +00:00
PKG_NAME:=sched-cake-oot
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git
cake-oot: update to latest HEAD Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-07-04 16:18:10 +00:00
PKG_SOURCE_DATE:=2020-07-24
PKG_SOURCE_VERSION:=48979385757f3408c3427b3ebbf5963efdada5aa
PKG_MIRROR_HASH:=0e8ed53f55e28ad0c30f20293c16988876bae8d6f70f5629a43cf2ce1e49fc51
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
include $(INCLUDE_DIR)/package.mk
kmod-sched-cake: rename to kmod-sched-cake-oot In preparation for dropping the out of tree cake module and using in tree cake from upstream, rename the package to kmod-sched-cake-oot (out of tree) Initially add a PROVIDES kmod-sched-cake so that package dependencies can be satisfied. Ultimately this package will be removed when linux 4.14 is removed. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-30 17:52:09 +00:00
define KernelPackage/sched-cake-oot
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
SUBMENU:=Network Support
kmod-sched-cake: rename to kmod-sched-cake-oot In preparation for dropping the out of tree cake module and using in tree cake from upstream, rename the package to kmod-sched-cake-oot (out of tree) Initially add a PROVIDES kmod-sched-cake so that package dependencies can be satisfied. Ultimately this package will be removed when linux 4.14 is removed. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-30 17:52:09 +00:00
TITLE:=OOT Cake fq_codel/blue derived shaper
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
URL:=https://github.com/dtaht/sch_cake
FILES:=$(PKG_BUILD_DIR)/sch_cake.ko
AUTOLOAD:=$(call AutoLoad,75,sch_cake)
kmod-sched-cake: switch to in-tree cake for 4.19+ Use in tree version of cake for kernels 4.19+ and backport features from later kernel versions to 4.19. Unfortunately PROVIDES dependency handling produces bogus circular dependency warnings so whilst this package and kmod-sched-cake-oot should be able to PROVIDE kmod-sched-cake this doesn't work. Instead, remove the PROVIDES option and modify package sqm-scripts to depend on the correct module independently. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:54:02 +00:00
DEPENDS:=@LINUX_4_14 +kmod-sched-core +kmod-ipt-conntrack
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
endef
kernel: Add kmod-sch-cake-virtual intermediate package 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>
2020-05-06 19:58:30 +00:00
define KernelPackage/sched-cake-oot/description
kmod-sched-cake: rename to kmod-sched-cake-oot In preparation for dropping the out of tree cake module and using in tree cake from upstream, rename the package to kmod-sched-cake-oot (out of tree) Initially add a PROVIDES kmod-sched-cake so that package dependencies can be satisfied. Ultimately this package will be removed when linux 4.14 is removed. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-30 17:52:09 +00:00
O(ut) O(f) T(ree) Common Applications Kept Enhanced fq_codel/blue derived shaper
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
endef
kernel: Add kmod-sch-cake-virtual intermediate package 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>
2020-05-06 19:58:30 +00:00
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
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
define Build/Compile
kernel: replace SUBDIRS with M in package recipes The SUBDIRS variable has been removed in kernel 5.4, and was deprecated since the beginnig of kernel git history in favour of M or KBUILD_EXTMOD. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2020-01-20 14:42:00 +00:00
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
Revert "kmod-sched-cake: drop out of tree package, use kernel version" This reverts commit 5c094ff660fd8e750ed1c1f38719a45065e77348. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2019-07-29 15:12:42 +00:00
endef
kmod-sched-cake: rename to kmod-sched-cake-oot In preparation for dropping the out of tree cake module and using in tree cake from upstream, rename the package to kmod-sched-cake-oot (out of tree) Initially add a PROVIDES kmod-sched-cake so that package dependencies can be satisfied. Ultimately this package will be removed when linux 4.14 is removed. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-30 17:52:09 +00:00
$(eval $(call KernelPackage,sched-cake-oot))
kernel: Add kmod-sch-cake-virtual intermediate package 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>
2020-05-06 19:58:30 +00:00
$(eval $(call KernelPackage,sched-cake-virtual))
Reference in New Issue Copy Permalink