hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: make kmod package dependencies forward compatible

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 8 years ago
parent 0519bafbda
commit 28af0f2fbd
4 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package/kernel/linux/modules/block.mk
  2. 4
      package/kernel/linux/modules/crypto.mk
  3. 2
      package/kernel/linux/modules/hwmon.mk
  4. 2
      package/kernel/linux/modules/other.mk

2
package/kernel/linux/modules/block.mk
Unescape View File

@ -326,7 +326,7 @@ $(eval $(call KernelPackage,md-raid10))
define KernelPackage/md-raid456 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 TITLE:=RAID Level 456 Driver
KCONFIG:= \ KCONFIG:= \
CONFIG_ASYNC_CORE \ CONFIG_ASYNC_CORE \

4
package/kernel/linux/modules/crypto.mk
Unescape View File

@ -27,7 +27,7 @@ define KernelPackage/crypto-aead
CONFIG_CRYPTO_AEAD2 CONFIG_CRYPTO_AEAD2
FILES:=$(LINUX_DIR)/crypto/aead.ko FILES:=$(LINUX_DIR)/crypto/aead.ko
AUTOLOAD:=$(call AutoLoad,09,aead,1) 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 endef
$(eval $(call KernelPackage,crypto-aead)) $(eval $(call KernelPackage,crypto-aead))
@ -242,7 +242,7 @@ $(eval $(call KernelPackage,crypto-hw-hifn-795x))
define KernelPackage/crypto-authenc define KernelPackage/crypto-authenc
TITLE:=Combined mode wrapper for IPsec 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 KCONFIG:=CONFIG_CRYPTO_AUTHENC
FILES:=$(LINUX_DIR)/crypto/authenc.ko FILES:=$(LINUX_DIR)/crypto/authenc.ko
AUTOLOAD:=$(call AutoLoad,09,authenc) AUTOLOAD:=$(call AutoLoad,09,authenc)

2
package/kernel/linux/modules/hwmon.mk
Unescape View File

@ -98,7 +98,7 @@ define KernelPackage/hwmon-ina2xx
KCONFIG:=CONFIG_SENSORS_INA2XX KCONFIG:=CONFIG_SENSORS_INA2XX
FILES:=$(LINUX_DIR)/drivers/hwmon/ina2xx.ko FILES:=$(LINUX_DIR)/drivers/hwmon/ina2xx.ko
AUTOLOAD:=$(call AutoProbe,ina2xx) 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 endef
define KernelPackage/hwmon-ina2xx/description define KernelPackage/hwmon-ina2xx/description

2
package/kernel/linux/modules/other.mk
Unescape View File

@ -30,7 +30,7 @@ $(eval $(call KernelPackage,6lowpan))
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support 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:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \

Write Preview
Loading…
Cancel
Save