[OpenWrt-Devel] [PATCH v1 1/2] kmod-sched-cake: rename to kmod-sched-cake-oot

[Kevin 'ldir' Darbyshire-Bryant]

> On 1 Apr 2020, at 18:07, Hannu Nyman <hannu.nyman at iki.fi> wrote:
> 
> Kevin Darbyshire-Bryant kirjoitti 1.4.2020 klo 13.14:
>> 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 at darbyshire-bryant.me.uk>
>> ---
>>  .../Makefile                                        | 13 +++++++------
>>  1 file changed, 7 insertions(+), 6 deletions(-)
>>  rename package/kernel/{kmod-sched-cake => kmod-sched-cake-oot}/Makefile (75%)
>> 
>> diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake-oot/Makefile
>> similarity index 75%
>> rename from package/kernel/kmod-sched-cake/Makefile
>> rename to package/kernel/kmod-sched-cake-oot/Makefile
>> index 42e45b5789..fbcb9cec4b 100644
>> --- a/package/kernel/kmod-sched-cake/Makefile
>> +++ b/package/kernel/kmod-sched-cake-oot/Makefile
>> @@ -8,7 +8,7 @@
>>  include $(TOPDIR)/rules.mk
>>  include $(INCLUDE_DIR)/kernel.mk
>>  -PKG_NAME:=sched-cake
>> +PKG_NAME:=sched-cake-oot
>>  PKG_RELEASE:=1
>>    PKG_SOURCE_PROTO:=git
>> @@ -20,23 +20,24 @@ PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
>>    include $(INCLUDE_DIR)/package.mk
>>  -define KernelPackage/sched-cake
>> +define KernelPackage/sched-cake-oot
>>    SUBMENU:=Network Support
>> -  TITLE:=Cake fq_codel/blue derived shaper
>> +  TITLE:=OOT Cake fq_codel/blue derived shaper
>>    URL:=https://github.com/dtaht/sch_cake
>>    FILES:=$(PKG_BUILD_DIR)/sch_cake.ko
>>    AUTOLOAD:=$(call AutoLoad,75,sch_cake)
>> -  DEPENDS:=+kmod-ipt-conntrack
>> +  DEPENDS:=+kmod-sched-core
>> +  PROVIDES:=kmod-sched-cake
>>  endef
>> 
> 
> I tried to compile kmod-sched-cake-oot for ar71xx with kernel 4.14, and it failed due to dependency error:
> 
> Package kmod-sched-cake-oot is missing dependencies for the following libraries:
> nf_conntrack.ko
> make[3]: *** [Makefile:52: /Openwrt/wndr3700/bin/targets/ar71xx/generic/packages/kmod-sched-cake-oot_4.14.172+2020-01-10-aeff7a3e-1_mips_24kc.ipk] Error 1
> make[3]: Leaving directory '/Openwrt/wndr3700/package/kernel/kmod-sched-cake-oot'
> 
> The old (out-of-tree) package had dependency for kmod-ipt-conntrack that was now replaced by sched-core, but that is apparently not enough?
> (kmod-ipt-conntrack selects kmod-nf-conntrack)

Ooops! - Yes it also needs +kmod-ipt-conntrack,  I’ll amend and resend soon.  Currently can’t get a build out of my mac due to the grub2 efi bump, so battling other issues.

Thanks for testing.

Cheers,

Kevin


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20200401/06999ad6/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel