From: Weijie Gao Date: Sat, 6 Jan 2024 08:12:06 +0000 (+0800) Subject: kernel: modules: block: adapt for kernel 6.6 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fnbd.git;a=commitdiff_plain;h=85ede9291bfa204982d35c5e036d42024575ae99 kernel: modules: block: adapt for kernel 6.6 Adapt block kmods for building under kernel 6.6: * To build scsi_transport_iscsi.ko, change CONFIG_SCSI_ISCSI_ATTRS from =y to =m as this config is always tristate since 2.6. Signed-off-by: Weijie Gao --- diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 5e6eefa76a..49a1b6fce1 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -263,7 +263,7 @@ define KernelPackage/iscsi-initiator CONFIG_INET \ CONFIG_SCSI_LOWLEVEL=y \ CONFIG_ISCSI_TCP \ - CONFIG_SCSI_ISCSI_ATTRS=y + CONFIG_SCSI_ISCSI_ATTRS FILES:= \ $(LINUX_DIR)/drivers/scsi/iscsi_tcp.ko \ $(LINUX_DIR)/drivers/scsi/libiscsi.ko \