Author: jow Date: 2015-01-31 14:55:51 +0100 (Sat, 31 Jan 2015) New Revision: 44229
Modified: trunk/package/kernel/linux/modules/crypto.mk trunk/package/kernel/linux/modules/fs.mk trunk/package/kernel/linux/modules/i2c.mk trunk/package/kernel/linux/modules/netdevices.mk trunk/package/kernel/linux/modules/other.mk trunk/package/kernel/linux/modules/usb.mk Log: linux: convert CompareKernelPatchVer to version tagged symbols Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/kernel/linux/modules/crypto.mk =================================================================== --- trunk/package/kernel/linux/modules/crypto.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/crypto.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -329,13 +329,10 @@ TITLE:=CRC32c CRC module DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32C -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.15.0)),1) - FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko - AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1) -else - FILES:=$(LINUX_DIR)/crypto/crc32c.ko - AUTOLOAD:=$(call AutoLoad,04,crc32c,1) -endif + FILES:= \ + $(LINUX_DIR)/crypto/[email protected] \ + $(LINUX_DIR)/crypto/[email protected] + AUTOLOAD:=$(call AutoLoad,04,[email protected] [email protected],1) $(call AddDepends/crypto) endef Modified: trunk/package/kernel/linux/modules/fs.mk =================================================================== --- trunk/package/kernel/linux/modules/fs.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/fs.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -316,20 +316,13 @@ TITLE:=Common NFS filesystem modules KCONFIG:= \ CONFIG_LOCKD \ - CONFIG_SUNRPC -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1) - KCONFIG+=CONFIG_GRACE_PERIOD + CONFIG_SUNRPC \ + [email protected] 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:= \ - $(LINUX_DIR)/fs/lockd/lockd.ko \ - $(LINUX_DIR)/net/sunrpc/sunrpc.ko - AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) -endif + $(LINUX_DIR)/net/sunrpc/sunrpc.ko \ + $(LINUX_DIR)/fs/nfs_common/[email protected] + AUTOLOAD:=$(call AutoLoad,30,[email protected] sunrpc lockd) endef $(eval $(call KernelPackage,fs-nfs-common)) Modified: trunk/package/kernel/linux/modules/i2c.mk =================================================================== --- trunk/package/kernel/linux/modules/i2c.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/i2c.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -24,10 +24,8 @@ CONFIG_I2C:drivers/i2c/i2c-core \ CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) - ifeq ($(CONFIG_OF),y) - I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c - endif +ifeq ($(CONFIG_OF),y) + I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/[email protected] endif define KernelPackage/i2c-core Modified: trunk/package/kernel/linux/modules/netdevices.mk =================================================================== --- trunk/package/kernel/linux/modules/netdevices.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/netdevices.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -114,11 +114,9 @@ SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Agere ET131x Gigabit Ethernet driver URL:=http://sourceforge.net/projects/et131x -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1) - FILES:=$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.$(LINUX_KMOD_SUFFIX) -else - FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX) -endif + FILES:= \ + $(LINUX_DIR)/drivers/staging/et131x/[email protected] \ + $(LINUX_DIR)/drivers/net/ethernet/agere/[email protected] KCONFIG:= \ CONFIG_ET131X \ CONFIG_ET131X_DEBUG=n Modified: trunk/package/kernel/linux/modules/other.mk =================================================================== --- trunk/package/kernel/linux/modules/other.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/other.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -261,11 +261,9 @@ KCONFIG:= \ CONFIG_AD799X_RING_BUFFER=y \ CONFIG_AD799X -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) - FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko -else - FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko -endif + FILES:= \ + $(LINUX_DIR)/drivers/staging/iio/adc/[email protected] \ + $(LINUX_DIR)/drivers/iio/adc/[email protected] AUTOLOAD:=$(call AutoLoad,56,ad799x) endef @@ -755,15 +753,11 @@ CONFIG_ZRAM_DEBUG=n \ CONFIG_PGTABLE_MAPPING=n \ 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:= \ - $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \ - $(LINUX_DIR)/drivers/staging/zram/zram.ko -endif + $(LINUX_DIR)/drivers/staging/zsmalloc/[email protected] \ + $(LINUX_DIR)/drivers/staging/zram/[email protected] \ + $(LINUX_DIR)/mm/[email protected] \ + $(LINUX_DIR)/drivers/block/zram/[email protected] AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) endef Modified: trunk/package/kernel/linux/modules/usb.mk =================================================================== --- trunk/package/kernel/linux/modules/usb.mk 2015-01-31 13:55:44 UTC (rev 44228) +++ trunk/package/kernel/linux/modules/usb.mk 2015-01-31 13:55:51 UTC (rev 44229) @@ -16,15 +16,10 @@ TITLE:=Support for USB DEPENDS:=@USB_SUPPORT 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:= \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ - $(LINUX_DIR)/drivers/usb/common/usb-common.ko -else - FILES:= \ - $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ - $(LINUX_DIR)/drivers/usb/usb-common.ko -endif + $(LINUX_DIR)/drivers/usb/[email protected] \ + $(LINUX_DIR)/drivers/usb/common/[email protected] AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) $(call AddDepends/nls) endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
