hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: convert CompareKernelPatchVer to version tagged symbols 

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44229 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2015-01-31 13:55:51 +00:00
parent 6e4e42727b
commit a3626aca95
6 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/kernel/linux/modules/crypto.mk
View File

@ -329,13 +329,10 @@ define KernelPackage/crypto-crc32c
TITLE:=CRC32c CRC module TITLE:=CRC32c CRC module
DEPENDS:=+kmod-crypto-hash DEPENDS:=+kmod-crypto-hash
KCONFIG:=CONFIG_CRYPTO_CRC32C KCONFIG:=CONFIG_CRYPTO_CRC32C
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.15.0)),1) FILES:= \
FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko $(LINUX_DIR)/crypto/crc32c.ko@lt3.15 \
AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1) $(LINUX_DIR)/crypto/crc32c_generic.ko@ge3.15
else AUTOLOAD:=$(call AutoLoad,04,crc32c@lt3.15 crc32c_generic@ge3.15,1)
FILES:=$(LINUX_DIR)/crypto/crc32c.ko
AUTOLOAD:=$(call AutoLoad,04,crc32c,1)
endif
$(call AddDepends/crypto) $(call AddDepends/crypto)
endef endef

17
package/kernel/linux/modules/fs.mk
View File

@ -316,20 +316,13 @@ define KernelPackage/fs-nfs-common
TITLE:=Common NFS filesystem modules TITLE:=Common NFS filesystem modules
KCONFIG:= \ KCONFIG:= \
CONFIG_LOCKD \ CONFIG_LOCKD \
CONFIG_SUNRPC CONFIG_SUNRPC \
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1) CONFIG_GRACE_PERIOD@ge3.18
KCONFIG+=CONFIG_GRACE_PERIOD
FILES:= \
$(LINUX_DIR)/fs/nfs_common/grace.ko \
$(LINUX_DIR)/fs/lockd/lockd.ko \
$(LINUX_DIR)/net/sunrpc/sunrpc.ko
AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
else
FILES:= \ FILES:= \
$(LINUX_DIR)/fs/lockd/lockd.ko \ $(LINUX_DIR)/fs/lockd/lockd.ko \
$(LINUX_DIR)/net/sunrpc/sunrpc.ko $(LINUX_DIR)/net/sunrpc/sunrpc.ko \
AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) $(LINUX_DIR)/fs/nfs_common/grace.ko@ge3.18
endif AUTOLOAD:=$(call AutoLoad,30,grace@ge3.18 sunrpc lockd)
endef endef
$(eval $(call KernelPackage,fs-nfs-common)) $(eval $(call KernelPackage,fs-nfs-common))

6
package/kernel/linux/modules/i2c.mk
View File

@ -24,10 +24,8 @@ I2C_CORE_MODULES:= \
CONFIG_I2C:drivers/i2c/i2c-core \ CONFIG_I2C:drivers/i2c/i2c-core \
CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) ifeq ($(CONFIG_OF),y)
ifeq ($(CONFIG_OF),y) I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c@lt3.12
I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c
endif
endif endif
define KernelPackage/i2c-core define KernelPackage/i2c-core

8
package/kernel/linux/modules/netdevices.mk
View File

@ -114,11 +114,9 @@ define KernelPackage/et131x
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Agere ET131x Gigabit Ethernet driver TITLE:=Agere ET131x Gigabit Ethernet driver
URL:=http://sourceforge.net/projects/et131x URL:=http://sourceforge.net/projects/et131x
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1) FILES:= \
FILES:=$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/staging/et131x/et131x.ko@lt3.18 \
else $(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko@ge3.18
FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
endif
KCONFIG:= \ KCONFIG:= \
CONFIG_ET131X \ CONFIG_ET131X \
CONFIG_ET131X_DEBUG=n CONFIG_ET131X_DEBUG=n

20
package/kernel/linux/modules/other.mk
View File

@ -261,11 +261,9 @@ define KernelPackage/iio-ad799x
KCONFIG:= \ KCONFIG:= \
CONFIG_AD799X_RING_BUFFER=y \ CONFIG_AD799X_RING_BUFFER=y \
CONFIG_AD799X CONFIG_AD799X
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) FILES:= \
FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko $(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko@lt3.16 \
else $(LINUX_DIR)/drivers/iio/adc/ad799x.ko@ge3.16
FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko
endif
AUTOLOAD:=$(call AutoLoad,56,ad799x) AUTOLOAD:=$(call AutoLoad,56,ad799x)
endef endef
@ -755,15 +753,11 @@ define KernelPackage/zram
CONFIG_ZRAM_DEBUG=n \ CONFIG_ZRAM_DEBUG=n \
CONFIG_PGTABLE_MAPPING=n \ CONFIG_PGTABLE_MAPPING=n \
CONFIG_ZRAM_LZ4_COMPRESS=y CONFIG_ZRAM_LZ4_COMPRESS=y
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1)
FILES:=\
$(LINUX_DIR)/mm/zsmalloc.ko \
$(LINUX_DIR)/drivers/block/zram/zram.ko
else
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \ $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko@lt3.14 \
$(LINUX_DIR)/drivers/staging/zram/zram.ko $(LINUX_DIR)/drivers/staging/zram/zram.ko@lt3.14 \
endif $(LINUX_DIR)/mm/zsmalloc.ko@ge3.14 \
$(LINUX_DIR)/drivers/block/zram/zram.ko@ge3.14
AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram)
endef endef

9
package/kernel/linux/modules/usb.mk
View File

@ -16,15 +16,10 @@ define KernelPackage/usb-core
TITLE:=Support for USB TITLE:=Support for USB
DEPENDS:=@USB_SUPPORT DEPENDS:=@USB_SUPPORT
KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/core/usbcore.ko \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \
$(LINUX_DIR)/drivers/usb/common/usb-common.ko $(LINUX_DIR)/drivers/usb/usb-common.ko@lt3.16 \
else $(LINUX_DIR)/drivers/usb/common/usb-common.ko@ge3.16
FILES:= \
$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
$(LINUX_DIR)/drivers/usb/usb-common.ko
endif
AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef