diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-22 11:40:17 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-27 11:18:27 +0100 |
| commit | 28af0f2fbd4fb66ecebdbbeca385054a2b105d3d (patch) | |
| tree | 79098f361ad94ec69a33b6b842ac8bb4e38745be | |
| parent | 0519bafbdaef7b2b6d3b553fa487e625f87fd176 (diff) | |
| download | upstream-28af0f2fbd4fb66ecebdbbeca385054a2b105d3d.tar.gz upstream-28af0f2fbd4fb66ecebdbbeca385054a2b105d3d.tar.bz2 upstream-28af0f2fbd4fb66ecebdbbeca385054a2b105d3d.zip | |
kernel: make kmod package dependencies forward compatible
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/kernel/linux/modules/block.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 4 | ||||
| -rw-r--r-- | package/kernel/linux/modules/hwmon.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/other.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 508b3abd5d..62f08218c6 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -326,7 +326,7 @@ $(eval $(call KernelPackage,md-raid10)) define KernelPackage/md-raid456 -$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor +LINUX_4_4:kmod-lib-crc32c) +$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor +!LINUX_3_18:kmod-lib-crc32c) TITLE:=RAID Level 456 Driver KCONFIG:= \ CONFIG_ASYNC_CORE \ diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 67526024e5..d9cb3dbce4 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -27,7 +27,7 @@ define KernelPackage/crypto-aead CONFIG_CRYPTO_AEAD2 FILES:=$(LINUX_DIR)/crypto/aead.ko AUTOLOAD:=$(call AutoLoad,09,aead,1) - $(call AddDepends/crypto, +LINUX_4_4:kmod-crypto-null) + $(call AddDepends/crypto, +!LINUX_3_18:kmod-crypto-null) endef $(eval $(call KernelPackage,crypto-aead)) @@ -242,7 +242,7 @@ $(eval $(call KernelPackage,crypto-hw-hifn-795x)) define KernelPackage/crypto-authenc TITLE:=Combined mode wrapper for IPsec - DEPENDS:=+kmod-crypto-manager +LINUX_4_4:kmod-crypto-null + DEPENDS:=+kmod-crypto-manager +!LINUX_3_18:kmod-crypto-null KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.ko AUTOLOAD:=$(call AutoLoad,09,authenc) diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index e2962058aa..8fdf62446d 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -98,7 +98,7 @@ define KernelPackage/hwmon-ina2xx KCONFIG:=CONFIG_SENSORS_INA2XX FILES:=$(LINUX_DIR)/drivers/hwmon/ina2xx.ko AUTOLOAD:=$(call AutoProbe,ina2xx) - $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_4_4:kmod-regmap) + $(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_3_18:kmod-regmap) endef define KernelPackage/hwmon-ina2xx/description diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 017a94c622..370dc29671 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_4_4:kmod-regmap + 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 KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ |