From ab29084cdbd0b1aca1cff4d56856bbdadb065132 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 28 Oct 2011 13:24:41 +0000 Subject: [PATCH] package/kernel: prefix library modules with lib- SVN-Revision: 28656 --- package/kernel/modules/001-depends.mk | 2 +- package/kernel/modules/crypto.mk | 2 +- package/kernel/modules/lib.mk | 46 +++++++++++++-------------- package/kernel/modules/netdevices.mk | 4 +-- package/kernel/modules/netfilter.mk | 4 +-- package/kernel/modules/netsupport.mk | 6 ++-- package/kernel/modules/spi.mk | 4 +-- package/mac80211/Makefile | 8 ++--- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk index 93aaeb33fb6e..73dd46b91066 100644 --- a/package/kernel/modules/001-depends.mk +++ b/package/kernel/modules/001-depends.mk @@ -6,7 +6,7 @@ # define AddDepends/crc16 - DEPENDS+= +kmod-crc16 $(1) + DEPENDS+= +kmod-lib-crc16 $(1) endef define AddDepends/hid diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 01fb8c8a21de..b2f012710743 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -260,7 +260,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-deflate TITLE:=Deflate compression CryptoAPI module - DEPENDS:=+kmod-zlib + DEPENDS:=+kmod-lib-zlib KCONFIG:=CONFIG_CRYPTO_DEFLATE FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,09,deflate) diff --git a/package/kernel/modules/lib.mk b/package/kernel/modules/lib.mk index 6e805568da52..432248edda97 100644 --- a/package/kernel/modules/lib.mk +++ b/package/kernel/modules/lib.mk @@ -7,7 +7,7 @@ LIB_MENU:=Libraries -define KernelPackage/crc-ccitt +define KernelPackage/lib-crc-ccitt SUBMENU:=$(LIB_MENU) TITLE:=CRC-CCITT support KCONFIG:=CONFIG_CRC_CCITT @@ -15,14 +15,14 @@ define KernelPackage/crc-ccitt AUTOLOAD:=$(call AutoLoad,20,crc-ccitt) endef -define KernelPackage/crc-ccitt/description +define KernelPackage/lib-crc-ccitt/description Kernel module for CRC-CCITT support endef -$(eval $(call KernelPackage,crc-ccitt)) +$(eval $(call KernelPackage,lib-crc-ccitt)) -define KernelPackage/crc-itu-t +define KernelPackage/lib-crc-itu-t SUBMENU:=$(LIB_MENU) TITLE:=CRC ITU-T V.41 support KCONFIG:=CONFIG_CRC_ITU_T @@ -30,14 +30,14 @@ define KernelPackage/crc-itu-t AUTOLOAD:=$(call AutoLoad,20,crc-itu-t) endef -define KernelPackage/crc-itu-t/description +define KernelPackage/lib-crc-itu-t/description Kernel module for CRC ITU-T V.41 support endef -$(eval $(call KernelPackage,crc-itu-t)) +$(eval $(call KernelPackage,lib-crc-itu-t)) -define KernelPackage/crc7 +define KernelPackage/lib-crc7 SUBMENU:=$(LIB_MENU) TITLE:=CRC7 support KCONFIG:=CONFIG_CRC7 @@ -45,14 +45,14 @@ define KernelPackage/crc7 AUTOLOAD:=$(call AutoLoad,20,crc7) endef -define KernelPackage/crc7/description +define KernelPackage/lib-crc7/description Kernel module for CRC7 support endef -$(eval $(call KernelPackage,crc7)) +$(eval $(call KernelPackage,lib-crc7)) -define KernelPackage/crc16 +define KernelPackage/lib-crc16 SUBMENU:=$(LIB_MENU) TITLE:=CRC16 support KCONFIG:=CONFIG_CRC16 @@ -60,32 +60,32 @@ define KernelPackage/crc16 AUTOLOAD:=$(call AutoLoad,20,crc16,1) endef -define KernelPackage/crc16/description +define KernelPackage/lib-crc16/description Kernel module for CRC16 support endef -$(eval $(call KernelPackage,crc16)) +$(eval $(call KernelPackage,lib-crc16)) -define KernelPackage/libcrc32c +define KernelPackage/lib-crc32c SUBMENU:=$(LIB_MENU) - TITLE:=CRC32 library support + TITLE:=CRC32 support KCONFIG:=CONFIG_LIBCRC32C DEPENDS:=+kmod-crypto-crc32c FILES:=$(LINUX_DIR)/lib/libcrc32c.ko AUTOLOAD:=$(call AutoLoad,20,libcrc32c,1) endef -define KernelPackage/libcrc32c/description +define KernelPackage/lib-crc32c/description Kernel module for CRC32 support endef -$(eval $(call KernelPackage,libcrc32c)) +$(eval $(call KernelPackage,lib-crc32c)) define KernelPackage/lib-lzo SUBMENU:=$(LIB_MENU) - TITLE:=LZO library support + TITLE:=LZO support KCONFIG:= \ CONFIG_LZO_COMPRESS \ CONFIG_LZO_DECOMPRESS @@ -102,9 +102,9 @@ endef $(eval $(call KernelPackage,lib-lzo)) -define KernelPackage/textsearch +define KernelPackage/lib-textsearch SUBMENU:=$(LIB_MENU) - TITLE:=Textsearch support is selected if needed + TITLE:=Textsearch support KCONFIG:= \ CONFIG_TEXTSEARCH=y \ CONFIG_TEXTSEARCH_KMP \ @@ -117,15 +117,15 @@ SUBMENU:=$(LIB_MENU) AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm) endef -$(eval $(call KernelPackage,textsearch)) +$(eval $(call KernelPackage,lib-textsearch)) -define KernelPackage/zlib +define KernelPackage/lib-zlib SUBMENU:=$(LIB_MENU) - TITLE:=zlib support is selected if needed + TITLE:=Zlib support KCONFIG:=CONFIG_ZLIB_DEFLATE FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko AUTOLOAD:=$(call AutoLoad,08,zlib_deflate,1) endef -$(eval $(call KernelPackage,zlib)) +$(eval $(call KernelPackage,lib-zlib)) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 837a7a904662..a10b8fe8d7d3 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -224,7 +224,7 @@ $(eval $(call KernelPackage,via-rhine)) define KernelPackage/via-velocity SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support - DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-crc-ccitt + DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-lib-crc-ccitt KCONFIG:=CONFIG_VIA_VELOCITY FILES:=$(LINUX_DIR)/drivers/net/via-velocity.ko AUTOLOAD:=$(call AutoLoad,50,via-velocity) @@ -501,7 +501,7 @@ $(eval $(call KernelPackage,hfcmulti)) define KernelPackage/gigaset SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Siemens Gigaset support for isdn4linux - DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-crc-ccitt +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-lib-crc-ccitt +kmod-usb-core URL:=http://gigaset307x.sourceforge.net/ KCONFIG:= \ CONFIG_ISDN_DRV_GIGASET \ diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 64c45558d842..713d8cbef735 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -89,7 +89,7 @@ define KernelPackage/ipt-filter KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) - $(call AddDepends/ipt,+kmod-textsearch) + $(call AddDepends/ipt,+kmod-lib-textsearch) endef define KernelPackage/ipt-filter/description @@ -206,7 +206,7 @@ define KernelPackage/ipt-nathelper-extra KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) - $(call AddDepends/ipt,+kmod-ipt-nat +kmod-textsearch) + $(call AddDepends/ipt,+kmod-ipt-nat +kmod-lib-textsearch) endef define KernelPackage/ipt-nathelper-extra/description diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 35823c2c9734..4f04627b5ed4 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -410,7 +410,7 @@ $(eval $(call KernelPackage,tun)) define KernelPackage/ppp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPP modules - DEPENDS:=+kmod-crc-ccitt + DEPENDS:=+kmod-lib-crc-ccitt KCONFIG:= \ CONFIG_PPP \ CONFIG_PPP_ASYNC \ @@ -717,7 +717,7 @@ define KernelPackage/sctp CONFIG_SCTP_HMAC_MD5=y FILES:= $(LINUX_DIR)/net/sctp/sctp.ko AUTOLOAD:= $(call AutoLoad,32,sctp) - DEPENDS:=+kmod-libcrc32c +kmod-crypto-md5 +kmod-crypto-hmac + DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac endef define KernelPackage/sctp/description diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk index 27f5c0eded7a..7cb2a354dc27 100644 --- a/package/kernel/modules/spi.mk +++ b/package/kernel/modules/spi.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ SPI_MENU:=SPI Support define KernelPackage/mmc-spi SUBMENU:=$(SPI_MENU) TITLE:=MMC/SD over SPI Support - DEPENDS:=+kmod-mmc +kmod-crc-itu-t +kmod-crc7 + DEPENDS:=+kmod-mmc +kmod-lib-crc-itu-t +kmod-lib-crc7 KCONFIG:=CONFIG_MMC_SPI \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 3fa2a9a237e4..f93d9d055bfa 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -159,7 +159,7 @@ endef define KernelPackage/p54-common $(call KernelPackage/p54/Default) - DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-crc-ccitt + DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-lib-crc-ccitt TITLE+= (COMMON) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko AUTOLOAD:=$(call AutoLoad,30,p54common) @@ -202,7 +202,7 @@ endef define KernelPackage/rt2x00-lib $(call KernelPackage/rt2x00/Default) - DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-crc-itu-t + DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t TITLE+= (LIB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.ko AUTOLOAD:=$(call AutoLoad,25,rt2x00lib) @@ -303,7 +303,7 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc + DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc TITLE+= (RT2860 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko AUTOLOAD:=$(call AutoLoad,28,rt2800pci) @@ -311,7 +311,7 @@ endef define KernelPackage/rt2800-usb $(call KernelPackage/rt2x00/Default) - DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-crc-ccitt + DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-lib-crc-ccitt TITLE+= (RT2870 USB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko AUTOLOAD:=$(call AutoLoad,28,rt2800usb) -- 2.30.2