[OpenWrt-Devel] kernel packages

[e9hack]

Hi,

it looks like I can make dependencies for a module itself depend on a kernel version only. My issue is, I've to add an additional kernel module to lib-lzo, which is part of lib-lzo in kernel 5.4.x:

diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index e14c6b31c0..ee71cf610f 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -109,9 +109,10 @@ define KernelPackage/lib-lzo
   HIDDEN:=1
   FILES:= \
 	$(LINUX_DIR)/crypto/lzo.ko \
+	$(LINUX_DIR)/crypto/lzo-rle.ko \
 	$(LINUX_DIR)/lib/lzo/lzo_compress.ko \
 	$(LINUX_DIR)/lib/lzo/lzo_decompress.ko
-  AUTOLOAD:=$(call AutoProbe,lzo lzo_compress lzo_decompress)
+  AUTOLOAD:=$(call AutoProbe,lzo lzo-rle lzo_compress lzo_decompress)
 endef
 
 define KernelPackage/lib-lzo/description

With the options, which you did mention, I can create a second lib-lzo (eg. lib-lzo-rle) and add the dependency to zlib:

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 43709228f9..d727719882 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -861,7 +861,7 @@ $(eval $(call KernelPackage,ikconfig))
 define KernelPackage/zram
   SUBMENU:=$(OTHER_MENU)
   TITLE:=ZRAM
-  DEPENDS:=+kmod-lib-lzo +kmod-lib-lz4
+  DEPENDS:=+!LINUX_5_4:kmod-lib-lzo +LINUX_5_4:kmod-lib-lzo-rle +kmod-lib-lz4
   KCONFIG:= \
 	CONFIG_ZSMALLOC \
 	CONFIG_ZRAM \

Or do I've another option to solve this?

Regards,
Hartmut

Am 28.04.2020 um 16:45 schrieb mail at adrianschmutzler.de:
> Hi,
> 
> @LINUX_5_4 
> @!LINUX_5_4
> +LINUX_5_4:somepackage
> +!LINUX_5_4:somepackage
> 
> further details:
> 
> https://openwrt.org/docs/guide-developer/packages#dependency_types
> 
> Best
> 
> Adrian
> 
>> -----Original Message-----
>> From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org]
>> On Behalf Of e9hack
>> Sent: Dienstag, 28. April 2020 15:32
>> To: openwrt-devel at lists.openwrt.org
>> Subject: [OpenWrt-Devel] kernel packages
>>
>> Hi,
>>
>> is it possible to depend on kernel versions in
>> package/kernel/linux/modules/lib.mk?
>>
>> With kernel 5.4.x, zram needs the additional module lzo-rle, which is part of
>> lib-lzo.
>>
>> Regards,
>> Hartmut
>>
>> _______________________________________________
>> openwrt-devel mailing list
>> openwrt-devel at lists.openwrt.org
>> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel