From f9435ac7e4e69fb0b12d15c1183834f0a17f279c Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Tue, 16 Oct 2018 01:07:43 +0200 Subject: [PATCH] generic: add 4.19-related module changes Signed-off-by: Zoltan HERPAI --- package/kernel/linux/modules/can.mk | 4 +++- package/kernel/linux/modules/fs.mk | 6 ++++-- package/kernel/linux/modules/iio.mk | 2 +- package/kernel/linux/modules/lib.mk | 7 +++++-- package/kernel/linux/modules/netsupport.mk | 2 +- package/kernel/linux/modules/other.mk | 11 ++++++----- package/kernel/linux/modules/video.mk | 14 +++++++++----- package/kernel/linux/modules/w1.mk | 2 +- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 925de4d8a5..6473fb79da 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -231,7 +231,9 @@ $(eval $(call KernelPackage,can-usb-esd)) define KernelPackage/can-usb-kvaser TITLE:=Kvaser CAN/USB interface KCONFIG:=CONFIG_CAN_KVASER_USB - FILES:=$(LINUX_DIR)/drivers/net/can/usb/kvaser_usb.ko + FILES:=\ + $(LINUX_DIR)/drivers/net/can/usb/kvaser_usb.ko@lt4.19 \ + $(LINUX_DIR)/drivers/net/can/usb/kvaser_usb/kvaser_usb.ko@ge4.19 AUTOLOAD:=$(call AutoProbe,kvaser_usb) $(call AddDepends/can,+kmod-usb-core) endef diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index ebf8677d93..d6d4b35bfb 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -50,7 +50,9 @@ define KernelPackage/fs-autofs4 SUBMENU:=$(FS_MENU) TITLE:=AUTOFS4 filesystem support KCONFIG:=CONFIG_AUTOFS4_FS - FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko + FILES:=\ + $(LINUX_DIR)/fs/autofs4/autofs4.ko@lt4.19 \ + $(LINUX_DIR)/fs/autofs/autofs4.ko@ge4.19 AUTOLOAD:=$(call AutoLoad,30,autofs4) endef @@ -64,7 +66,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +LINUX_4_14:kmod-lib-zstd + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +LINUX_4_14:kmod-lib-zstd +LINUX_4_19:kmod-lib-zstd KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n \ diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index b7eb048516..be2e8d46a6 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -89,7 +89,7 @@ $(eval $(call KernelPackage,iio-dht11)) define KernelPackage/iio-bmp280 SUBMENU:=$(IIO_MENU) TITLE:=BMP180/BMP280/BME280 pressure/temperatur sensor - DEPENDS:=@(LINUX_4_9||LINUX_4_14) +kmod-iio-core +kmod-regmap + DEPENDS:=@(LINUX_4_9||LINUX_4_14||LINUX_4_19) +kmod-iio-core +kmod-regmap KCONFIG:=CONFIG_BMP280 FILES:=$(LINUX_DIR)/drivers/iio/pressure/bmp280.ko endef diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index 6d7e0dc996..fd5f716983 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -56,6 +56,7 @@ define KernelPackage/lib-crc8 SUBMENU:=$(LIB_MENU) TITLE:=CRC8 support KCONFIG:=CONFIG_CRC8 + DEPENDS:=+LINUX_4_19:kmod-crypto-acompress FILES:=$(LINUX_DIR)/lib/crc8.ko AUTOLOAD:=$(call AutoProbe,crc8) endef @@ -101,7 +102,7 @@ $(eval $(call KernelPackage,lib-crc32c)) define KernelPackage/lib-lzo SUBMENU:=$(LIB_MENU) TITLE:=LZO support - DEPENDS:=+LINUX_4_14:kmod-crypto-acompress + DEPENDS:=+LINUX_4_14:kmod-crypto-acompress +LINUX_4_19:kmod-crypto-acompress KCONFIG:= \ CONFIG_CRYPTO_LZO@ge4.9 \ CONFIG_LZO_COMPRESS \ @@ -146,7 +147,7 @@ $(eval $(call KernelPackage,lib-zstd)) define KernelPackage/lib-lz4 SUBMENU:=$(LIB_MENU) TITLE:=LZ4 support - DEPENDS:=+LINUX_4_14:kmod-crypto-acompress + DEPENDS:=+LINUX_4_14:kmod-crypto-acompress +LINUX_4_19:kmod-crypto-acompress HIDDEN:=1 KCONFIG:= \ CONFIG_CRYPTO_LZ4@ge4.9 \ @@ -228,6 +229,7 @@ define KernelPackage/lib-zlib-inflate TITLE:=Zlib support HIDDEN:=1 KCONFIG:=CONFIG_ZLIB_INFLATE + DEPENDS:=+LINUX_4_19:kmod-crypto-acompress FILES:=$(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko AUTOLOAD:=$(call AutoProbe,zlib_inflate) endef @@ -240,6 +242,7 @@ define KernelPackage/lib-zlib-deflate TITLE:=Zlib support HIDDEN:=1 KCONFIG:=CONFIG_ZLIB_DEFLATE + DEPENDS:=+LINUX_4_19:kmod-crypto-acompress FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko AUTOLOAD:=$(call AutoProbe,zlib_deflate) endef diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 050541488c..8e2551cfa4 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -996,7 +996,7 @@ $(eval $(call KernelPackage,rxrpc)) define KernelPackage/mpls SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=MPLS support - DEPENDS:=@!(LINUX_3_18||LINUX_4_1) + DEPENDS:=@!(LINUX_3_18||LINUX_4_1) +LINUX_4_19:kmod-iptunnel KCONFIG:= \ CONFIG_MPLS=y \ CONFIG_LWTUNNEL=y \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 7df93d3a01..58b06f2b6b 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -30,7 +30,7 @@ $(eval $(call KernelPackage,6lowpan)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +!LINUX_3_18:kmod-crypto-cmac +!LINUX_3_18:kmod-regmap +LINUX_4_14:kmod-crypto-ecdh + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +!LINUX_3_18:kmod-crypto-cmac +!LINUX_3_18:kmod-regmap +LINUX_4_14:kmod-crypto-ecdh +LINUX_4_19:kmod-crypto-ecdh +LINUX_4_19:kmod-crypto-kpp KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -150,6 +150,7 @@ $(eval $(call KernelPackage,dma-buf)) define KernelPackage/nvmem SUBMENU:=$(OTHER_MENU) TITLE:=Non Volatile Memory support + DEPENDS:=@!LINUX_4_19 # for now, as nvmem_core was moved into bool from tristate KCONFIG:=CONFIG_NVMEM HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/nvmem/nvmem_core.ko@ge4.9 @@ -484,7 +485,7 @@ define KernelPackage/rtc-ds1307 SUBMENU:=$(OTHER_MENU) TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support DEFAULT:=m if ALL_KMODS && RTC_SUPPORT - DEPENDS:=+kmod-i2c-core +LINUX_4_14:kmod-regmap + DEPENDS:=+kmod-i2c-core +LINUX_4_14:kmod-regmap +LINUX_4_19:kmod-hwmon-core KCONFIG:=CONFIG_RTC_DRV_DS1307 \ CONFIG_RTC_CLASS=y FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1307.ko @@ -907,8 +908,8 @@ define KernelPackage/random-tpm SUBMENU:=$(OTHER_MENU) TITLE:=Hardware Random Number Generator TPM support KCONFIG:=CONFIG_HW_RANDOM_TPM - FILES:=$(LINUX_DIR)/drivers/char/hw_random/tpm-rng.ko - DEPENDS:= +kmod-random-core +kmod-tpm + FILES:=$(LINUX_DIR)/drivers/char/hw_random/tpm-rng.ko@lt4.19 + DEPENDS:= +kmod-random-core +kmod-tpm # moved to bool from tristate in 4.19 AUTOLOAD:=$(call AutoProbe,tpm-rng) endef @@ -1036,7 +1037,7 @@ define KernelPackage/tpm SUBMENU:=$(OTHER_MENU) TITLE:=TPM Hardware Support KCONFIG:= CONFIG_TCG_TPM - FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko + FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko@lt4.19 AUTOLOAD:=$(call AutoLoad,10,tpm,1) endef diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 3f46860f54..31076e09e3 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -313,11 +313,15 @@ define KernelPackage/video-videobuf2 CONFIG_VIDEOBUF2_MEMOPS \ CONFIG_VIDEOBUF2_VMALLOC FILES:= \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko@ge4.4 \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko - AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2@ge4.4 videobuf2-memops videobuf2-vmalloc) + $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko@lt4.19 \ + $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko@lt4.19 \ + $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko@lt4.19 \ + $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko@lt4.19 \ + $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-common.ko@ge4.19 \ + $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-v4l2.ko@ge4.19 \ + $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-vmalloc.ko@ge4.19 \ + $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-memops.ko@ge4.19 + AUTOLOAD:=$(call AutoLoad,65,videobuf2-core@lt4.19 videobuf-v4l2@lt4.19 videobuf2-memops@lt4.19 videobuf2-vmalloc@lt4.19) $(call AddDepends/video) endef diff --git a/package/kernel/linux/modules/w1.mk b/package/kernel/linux/modules/w1.mk index e936a28145..d9f20c7e1f 100644 --- a/package/kernel/linux/modules/w1.mk +++ b/package/kernel/linux/modules/w1.mk @@ -14,7 +14,7 @@ define KernelPackage/w1 TITLE:=Dallas's 1-wire support KCONFIG:=CONFIG_W1 FILES:=$(LINUX_DIR)/drivers/w1/wire.ko - DEPENDS:=+LINUX_4_14:kmod-hwmon-core + DEPENDS:=+LINUX_4_14:kmod-hwmon-core +LINUX_4_19:kmod-hwmon-core endef define KernelPackage/w1/description -- 2.30.2