From b4682278275c3246a3db5c847d7256057de9fbed Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Sun, 15 May 2011 09:37:24 +0000 Subject: [PATCH] package/kernel: Remove $(KMOD_SUFFIX) usage Since there's only 2.6 in trunk $(KMOD_SUFFIX) can be safely replaced with ko for all mainline kernel modules. Signed-off-by: Jonas Gorski SVN-Revision: 26900 --- package/kernel/modules/block.mk | 30 ++++++++++++++-------------- package/kernel/modules/netfilter.mk | 2 +- package/kernel/modules/netsupport.mk | 10 +++++----- package/kernel/modules/other.mk | 10 +++++----- package/kernel/modules/usb.mk | 2 +- package/kernel/modules/virtual.mk | 6 +++--- package/kernel/modules/wireless.mk | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 8037449c0c..75f888590a 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -214,7 +214,7 @@ define KernelPackage/md-mod CONFIG_BLK_DEV_MD=m \ CONFIG_MD_AUTODETECT=y \ CONFIG_MD_FAULTY=n - FILES:=$(LINUX_DIR)/drivers/md/md-mod.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/md-mod.ko AUTOLOAD:=$(call AutoLoad,27,md-mod) endef @@ -236,7 +236,7 @@ define KernelPackage/md-linear $(call KernelPackage/md/Depends,) TITLE:=RAID Linear Module KCONFIG:=CONFIG_MD_LINEAR=m - FILES:=$(LINUX_DIR)/drivers/md/linear.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/linear.ko AUTOLOAD:=$(call AutoLoad,28,linear) endef @@ -251,7 +251,7 @@ define KernelPackage/md-raid0 $(call KernelPackage/md/Depends,) TITLE:=RAID0 Module KCONFIG:=CONFIG_MD_RAID0=m - FILES:=$(LINUX_DIR)/drivers/md/raid0.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/raid0.ko AUTOLOAD:=$(call AutoLoad,28,raid0) endef @@ -266,7 +266,7 @@ define KernelPackage/md-raid1 $(call KernelPackage/md/Depends,) TITLE:=RAID1 Module KCONFIG:=CONFIG_MD_RAID1=m - FILES:=$(LINUX_DIR)/drivers/md/raid1.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/raid1.ko AUTOLOAD:=$(call AutoLoad,28,raid1) endef @@ -281,7 +281,7 @@ define KernelPackage/md-raid10 $(call KernelPackage/md/Depends,) TITLE:=RAID10 Module KCONFIG:=CONFIG_MD_RAID10=m - FILES:=$(LINUX_DIR)/drivers/md/raid10.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/raid10.ko AUTOLOAD:=$(call AutoLoad,28,raid10) endef @@ -307,22 +307,22 @@ $(call KernelPackage/md/Depends,) CONFIG_MD_RAID456=m \ CONFIG_MULTICORE_RAID456=n FILES:= \ - $(LINUX_DIR)/crypto/xor.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/async_tx/async_tx.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/async_tx/async_memcpy.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/async_tx/async_xor.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/async_tx/async_pq.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/async_tx/async_raid6_recov.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/md/raid456.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/xor.ko \ + $(LINUX_DIR)/crypto/async_tx/async_tx.ko \ + $(LINUX_DIR)/crypto/async_tx/async_memcpy.ko \ + $(LINUX_DIR)/crypto/async_tx/async_xor.ko \ + $(LINUX_DIR)/crypto/async_tx/async_pq.ko \ + $(LINUX_DIR)/crypto/async_tx/async_raid6_recov.ko \ + $(LINUX_DIR)/drivers/md/raid456.ko # Additional files with kernel-dependent locations or presence # For Linux >= 2.6.36 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)), 1) FILES+= \ - $(LINUX_DIR)/lib/raid6/raid6_pq.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/lib/raid6/raid6_pq.ko # For Linux < 2.6.36 else FILES+= \ - $(LINUX_DIR)/drivers/md/raid6_pq.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/md/raid6_pq.ko endif AUTOLOAD:=$(call AutoLoad,28, xor async_tx async_memcpy async_xor raid6_pq async_pq async_raid6_recov raid456) endef @@ -348,7 +348,7 @@ define KernelPackage/md-multipath $(call KernelPackage/md/Depends,) TITLE:=MD Multipath Module KCONFIG:=CONFIG_MD_MULTIPATH=m - FILES:=$(LINUX_DIR)/drivers/md/multipath.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/multipath.ko AUTOLOAD:=$(call AutoLoad,29,multipath) endef diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 9f6e23ace8..d24329fae5 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -283,7 +283,7 @@ $(eval $(call KernelPackage,ipt-debug)) define KernelPackage/ipt-led TITLE:=Module to trigger a LED with a Netfilter rule KCONFIG:=$(KCONFIG_IPT_LED) - FILES:=$(foreach mod,$(IPT_LED-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_LED-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,61,$(notdir $(IPT_LED-m))) $(call AddDepends/ipt) endef diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 41355b096f..a1518156fa 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -657,8 +657,8 @@ define KernelPackage/l2tp KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ CONFIG_L2TP_DEBUGFS=n - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.ko \ + $(LINUX_DIR)/net/l2tp/l2tp_netlink.ko AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink) endef @@ -674,7 +674,7 @@ define KernelPackage/l2tp-eth TITLE:=L2TP ethernet pseudowire support for L2TPv3 DEPENDS:=+kmod-l2tp KCONFIG:=CONFIG_L2TP_ETH - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.ko AUTOLOAD:=$(call AutoLoad,33,l2tp_eth) endef @@ -689,7 +689,7 @@ define KernelPackage/l2tp-ip TITLE:=L2TP IP encapsulation for L2TPv3 DEPENDS:=+kmod-l2tp KCONFIG:=CONFIG_L2TP_IP - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) endef @@ -710,7 +710,7 @@ define KernelPackage/sctp CONFIG_SCTP_HMAC_NONE=n \ CONFIG_SCTP_HMAC_SHA1=n \ CONFIG_SCTP_HMAC_MD5=y - FILES:= $(LINUX_DIR)/net/sctp/sctp.$(LINUX_KMOD_SUFFIX) + FILES:= $(LINUX_DIR)/net/sctp/sctp.ko AUTOLOAD:= $(call AutoLoad,32,sctp) DEPENDS:=+kmod-libcrc32c +kmod-crypto-md5 +kmod-crypto-hmac endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index ac0416cc6c..5ab43368ee 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -76,7 +76,7 @@ define KernelPackage/cpu-msr TITLE:=x86 CPU MSR support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_X86_MSR - FILES:=$(LINUX_DIR)/arch/x86/kernel/msr.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/arch/x86/kernel/msr.ko AUTOLOAD:=$(call AutoLoad,20,msr) endef @@ -431,7 +431,7 @@ define KernelPackage/oprofile SUBMENU:=$(OTHER_MENU) TITLE:=OProfile profiling support KCONFIG:=CONFIG_OPROFILE - FILES:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/oprofile/oprofile.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/oprofile/oprofile.ko DEPENDS:=@KERNEL_PROFILING endef @@ -624,7 +624,7 @@ define KernelPackage/rtc-core SUBMENU:=$(OTHER_MENU) TITLE:=Real Time Clock class support KCONFIG:=CONFIG_RTC_CLASS - FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.ko AUTOLOAD:=$(call AutoLoad,29,rtc-core) endef @@ -639,7 +639,7 @@ define KernelPackage/rtc-pcf8563 TITLE:=Philips PCF8563/Epson RTC8564 RTC support DEPENDS:=+kmod-rtc-core KCONFIG:=CONFIG_RTC_DRV_PCF8563 - FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.ko AUTOLOAD:=$(call AutoLoad,60,rtc-pcf8563) endef @@ -656,7 +656,7 @@ define KernelPackage/n810bm TITLE:=Nokia N810 battery management driver DEPENDS:=@TARGET_omap24xx KCONFIG:=CONFIG_N810BM - FILES:=$(LINUX_DIR)/drivers/cbus/n810bm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/cbus/n810bm.ko AUTOLOAD:=$(call AutoLoad,01,n810bm) endef diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index d397a6d607..e543cd644e 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -355,7 +355,7 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) define KernelPackage/usb-serial-ipw TITLE:=Support for IPWireless 3G devices KCONFIG:=CONFIG_USB_SERIAL_IPW - FILES:=$(LINUX_DIR)/drivers/usb/serial/ipw.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ipw.ko AUTOLOAD:=$(call AutoLoad,65,ipw) $(call AddDepends/usb-serial) endef diff --git a/package/kernel/modules/virtual.mk b/package/kernel/modules/virtual.mk index fc372b5682..8f9261acdb 100644 --- a/package/kernel/modules/virtual.mk +++ b/package/kernel/modules/virtual.mk @@ -13,7 +13,7 @@ define KernelPackage/virtio-balloon TITLE:=VirtIO balloon driver DEPENDS:=@TARGET_x86_kvm_guest KCONFIG:=CONFIG_VIRTIO_BALLOON - FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko AUTOLOAD:=$(call AutoLoad,06,virtio-balloon) endef @@ -29,7 +29,7 @@ define KernelPackage/virtio-net TITLE:=VirtIO network driver DEPENDS:=@TARGET_x86_kvm_guest KCONFIG:=CONFIG_VIRTIO_NET - FILES:=$(LINUX_DIR)/drivers/net/virtio_net.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko AUTOLOAD:=$(call AutoLoad,50,virtio_net) endef @@ -45,7 +45,7 @@ define KernelPackage/virtio-random TITLE:=VirtIO Random Number Generator support DEPENDS:=@TARGET_x86_kvm_guest KCONFIG:=CONFIG_HW_RANDOM_VIRTIO - FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko AUTOLOAD:=$(call AutoLoad,09,virtio-rng) endef diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 8d46979fb8..edf6da5850 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -60,7 +60,7 @@ define KernelPackage/net-zd1201 TITLE:=Zydas ZD1201 support DEPENDS:=@USB_SUPPORT KCONFIG:=CONFIG_USB_ZD1201 +@DRIVER_WEXT_SUPPORT - FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.ko AUTOLOAD:=$(call AutoLoad,60,zd1201) endef -- 2.30.2