cleanup, nuke obsolete 'Kernel drivers' category, convert remaining kmod packages to KernelPackage interface
SVN-Revision: 6136
This commit is contained in:
		| @@ -33,7 +33,7 @@ define KernelPackage/sangam-atm-annex-a | |||||||
| endef | endef | ||||||
|  |  | ||||||
| define KernelPackage/sangam-atm-annex-b | define KernelPackage/sangam-atm-annex-b | ||||||
|   $(call Package/kmod-sangam-atm-annex-a) |   $(call KernelPackage/sangam-atm-annex-a) | ||||||
|   TITLE:=AR7 ADSL driver (Annex B) |   TITLE:=AR7 ADSL driver (Annex B) | ||||||
|   DESCRIPTION:=The AR7 ADSL driver for Annex B |   DESCRIPTION:=The AR7 ADSL driver for Annex B | ||||||
| endef | endef | ||||||
|   | |||||||
| @@ -17,8 +17,7 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) | |||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| define KernelPackage/diag | define KernelPackage/diag | ||||||
|   SECTION:=kernel |   SUBMENU:=Other modules | ||||||
|   CATEGORY:=Kernel drivers |  | ||||||
|   DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM |   DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM | ||||||
|   TITLE:=Driver for router LEDs and Buttons |   TITLE:=Driver for router LEDs and Buttons | ||||||
|   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) |   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) | ||||||
|   | |||||||
| @@ -24,14 +24,14 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) | |||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| define Package/broadcom-wl/Default | define Package/broadcom-wl/Default | ||||||
|   SECTION:=net |   SECTION:=kernel | ||||||
|   CATEGORY:=Kernel drivers |   CATEGORY:=Kernel modules | ||||||
|   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo |   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo | ||||||
|   SUBMENU:=Proprietary BCM43xx WiFi driver |   SUBMENU:=Proprietary BCM43xx WiFi driver | ||||||
|   SUBMENUDEP:=@LINUX_2_4_BRCM |   SUBMENUDEP:=@LINUX_2_4_BRCM | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-brcm-wl/Default | define KernelPackage/brcm-wl/Default | ||||||
|   $(call Package/broadcom-wl/Default) |   $(call Package/broadcom-wl/Default) | ||||||
|   SECTION:=kernel |   SECTION:=kernel | ||||||
|   DEPENDS:=@LINUX_2_4_BRCM |   DEPENDS:=@LINUX_2_4_BRCM | ||||||
| @@ -40,16 +40,18 @@ define Package/kmod-brcm-wl/Default | |||||||
| 	This package contains the proprietary wireless driver for the Broadcom \\\ | 	This package contains the proprietary wireless driver for the Broadcom \\\ | ||||||
| 	BCM43xx chipset | 	BCM43xx chipset | ||||||
|   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE) |   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE) | ||||||
|  |   FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o | ||||||
|  |   AUTOLOAD:=$(call AutoLoad,30,wl$(1)) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-brcm-wl | define KernelPackage/brcm-wl | ||||||
|   $(call Package/kmod-brcm-wl/Default) |   $(call KernelPackage/brcm-wl/Default,) | ||||||
|   TITLE+= (normal version) |   TITLE+= (normal version) | ||||||
|   DESCRIPTION+= (normal version). |   DESCRIPTION+= (normal version). | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-brcm-wl-mimo | define KernelPackage/brcm-wl-mimo | ||||||
|   $(call Package/kmod-brcm-wl/Default) |   $(call KernelPackage/brcm-wl/Default,_mimo) | ||||||
|   TITLE+= (MIMO version) |   TITLE+= (MIMO version) | ||||||
|   DESCRIPTION+= (MIMO version). |   DESCRIPTION+= (MIMO version). | ||||||
| endef | endef | ||||||
| @@ -104,21 +106,6 @@ define Build/Compile | |||||||
| 		all | 		all | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define wl_template |  | ||||||
| 	$(INSTALL_DIR) $(1)/etc/modules.d |  | ||||||
| 	echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2) |  | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/kmod/wl$(2).o $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/kmod-brcm-wl/install |  | ||||||
| 	$(call wl_template,$(1)) |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/kmod-brcm-wl-mimo/install |  | ||||||
| 	$(call wl_template,$(1),_mimo) |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/wlc/install | define Package/wlc/install | ||||||
| 	$(CP) ./files/* $(1)/ | 	$(CP) ./files/* $(1)/ | ||||||
| 	$(INSTALL_DIR) $(1)/sbin | 	$(INSTALL_DIR) $(1)/sbin | ||||||
| @@ -139,8 +126,8 @@ define Package/nas/install | |||||||
| 	ln -sf nas $(1)/usr/sbin/nas4wds | 	ln -sf nas $(1)/usr/sbin/nas4wds | ||||||
| endef | endef | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,kmod-brcm-wl)) | $(eval $(call KernelPackage,brcm-wl)) | ||||||
| $(eval $(call BuildPackage,kmod-brcm-wl-mimo)) | $(eval $(call KernelPackage,brcm-wl-mimo)) | ||||||
| $(eval $(call BuildPackage,wlc)) | $(eval $(call BuildPackage,wlc)) | ||||||
| $(eval $(call BuildPackage,wl)) | $(eval $(call BuildPackage,wl)) | ||||||
| $(eval $(call BuildPackage,nas)) | $(eval $(call BuildPackage,nas)) | ||||||
|   | |||||||
| @@ -120,13 +120,13 @@ ifeq ($(KERNEL),2.4) | |||||||
| 		modules | 		modules | ||||||
|   endef |   endef | ||||||
|  |  | ||||||
|   define Package/kmod-hostap-pci/install |   define KernelPackage/hostap-pci/install | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) | 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) | ||||||
| 	$(CP) \ | 	$(CP) \ | ||||||
| 		$(1)/lib/modules/$(LINUX_VERSION)/ | 		$(1)/lib/modules/$(LINUX_VERSION)/ | ||||||
|   endef |   endef | ||||||
|  |  | ||||||
|   define Package/kmod-hostap-plx/install |   define KernelPackage/hostap-plx/install | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) | 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) | ||||||
| 	$(CP) \ | 	$(CP) \ | ||||||
| 		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \ | 		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \ | ||||||
|   | |||||||
| @@ -22,14 +22,14 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) | |||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages | define KernelPackage/spca5xx | ||||||
| define Package/kmod-spca5xx |   SUBMENU:=Other modules | ||||||
|   SECTION:=kernel |   DEPENDS:=kmod-usb-core kmod-videodev | ||||||
|   CATEGORY:=Kernel drivers |  | ||||||
|   DEPENDS:=@PACKAGE_KMOD_USB&&PACKAGE_KMOD_VIDEODEV |  | ||||||
|   TITLE:=Driver for SPCA5xx based USB cameras |   TITLE:=Driver for SPCA5xx based USB cameras | ||||||
|   URL:=http://mxhaard.free.fr/ |   URL:=http://mxhaard.free.fr/ | ||||||
|   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) |   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) | ||||||
|  |   FILES:=$(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) | ||||||
|  |   AUTLOAD:=$(call AutoLoad,90,spca5xx) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Build/Compile | define Build/Compile | ||||||
| @@ -43,10 +43,4 @@ define Build/Compile | |||||||
| 		modules | 		modules | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-spca5xx/install | $(eval $(call KernelPackage,spca5xx)) | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(CP) $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ |  | ||||||
| 		$(1)/lib/modules/$(LINUX_VERSION)/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,kmod-spca5xx)) |  | ||||||
|   | |||||||
| @@ -16,14 +16,18 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) | |||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| define Package/kmod-switch | define KernelPackage/switch | ||||||
|   SECTION:=kernel |   SUBMENU:=Other modules | ||||||
|   CATEGORY:=Kernel drivers |  | ||||||
|   DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM |   DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM | ||||||
|   TITLE:=Switch drivers |   TITLE:=Switch drivers | ||||||
|   DESCRIPTION:=\ |   DESCRIPTION:=\ | ||||||
| 	This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch. | 	This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch. | ||||||
|   VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) |   VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) | ||||||
|  |   FILES:= \ | ||||||
|  | 	$(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \ | ||||||
|  | 	$(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \ | ||||||
|  | 	$(PKG_BUILD_DIR)/switch-robo.$(LINUX_KMOD_SUFFIX) | ||||||
|  |   AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Build/Prepare | define Build/Prepare | ||||||
| @@ -40,14 +44,9 @@ define Build/Compile | |||||||
| 		modules | 		modules | ||||||
| endef | endef | ||||||
| 	 | 	 | ||||||
| define Package/kmod-switch/install | define KernelPackage/switch/install | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ |  | ||||||
| 		$(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(INSTALL_DIR) $(1)/lib/network/ | 	$(INSTALL_DIR) $(1)/lib/network/ | ||||||
| 	$(INSTALL_BIN) ./files/switch.sh $(1)/lib/network/ | 	$(INSTALL_BIN) ./files/switch.sh $(1)/lib/network/ | ||||||
| 	$(INSTALL_DIR) $(1)/etc/modules.d/ |  | ||||||
| 	printf 'switch-core\nswitch-robo\nswitch-adm\n' > $(1)/etc/modules.d/20-switch |  | ||||||
| endef | endef | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,kmod-switch)) | $(eval $(call KernelPackage,switch)) | ||||||
|   | |||||||
| @@ -23,14 +23,16 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install | |||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| #FIXME: add dependency on kmod-usb-core | define KernelPackage/ueagle-atm | ||||||
| define Package/kmod-ueagle-atm |   SUBMENU:=Network Devices | ||||||
|   SECTION:=kernel |   DEPENDS:=@ATM_SUPPORT kmod-usb-core  | ||||||
|   CATEGORY:=Kernel drivers |  | ||||||
|   DEPENDS:=@LINUX_2_6_BRCM @PACKAGE_KMOD_USB |  | ||||||
|   TITLE:=Driver for Eagle 8051 based USB ADSL modems |   TITLE:=Driver for Eagle 8051 based USB ADSL modems | ||||||
|   URL:=http://www.eagle-usb.org/ |   URL:=http://www.eagle-usb.org/ | ||||||
|   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) |   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) | ||||||
|  |   FILES:= \ | ||||||
|  | 	$(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \ | ||||||
|  | 	$(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) | ||||||
|  |   AUTOLOAD:=$(call AutoLoad,50,usbatm ueagle-atm) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Build/Compile | define Build/Compile | ||||||
| @@ -42,14 +44,4 @@ define Build/Compile | |||||||
| 		all | 		all | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-ueagle-atm/install | $(eval $(call KernelPackage,ueagle-atm)) | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(CP)	$(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ |  | ||||||
| 		$(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \ |  | ||||||
| 		$(1)/lib/modules/$(LINUX_VERSION)/ |  | ||||||
| 	$(INSTALL_DIR) $(1)/etc/modules.d |  | ||||||
| 	$(INSTALL_DATA) ./files/$(PKG_NAME).modules \ |  | ||||||
| 		$(1)/etc/modules.d/10-$(PKG_NAME) |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,kmod-ueagle-atm)) |  | ||||||
|   | |||||||
| @@ -1,2 +0,0 @@ | |||||||
| usbatm |  | ||||||
| ueagle-atm |  | ||||||
| @@ -16,10 +16,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) | |||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk | include $(INCLUDE_DIR)/package.mk | ||||||
|  |  | ||||||
| define Package/kmod-wlcompat/Default | define KernelPackage/wlcompat/Default | ||||||
|   SECTION:=kernel |   SUBMENU:=Proprietary BCM43xx WiFi driver | ||||||
|   CATEGORY:=Kernel drivers |   SUBMENUDEP:=@LINUX_2_4_BRCM | ||||||
|   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools |   DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools | ||||||
|   TITLE:=Broadcom wl wrapper module |   TITLE:=Broadcom wl wrapper module | ||||||
|   DESCRIPTION:=\ |   DESCRIPTION:=\ | ||||||
| 	This package contains a wrapper module, that provides Wireless Extension \\\ | 	This package contains a wrapper module, that provides Wireless Extension \\\ | ||||||
| @@ -27,16 +27,19 @@ define Package/kmod-wlcompat/Default | |||||||
|   VERSION:=$(LINUX_VERSION)+$(BOARD)-$(PKG_RELEASE) |   VERSION:=$(LINUX_VERSION)+$(BOARD)-$(PKG_RELEASE) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-wlcompat | define KernelPackage/wlcompat | ||||||
|   $(call Package/kmod-wlcompat/Default) |   $(call KernelPackage/wlcompat/Default) | ||||||
|  |   FILES:=$(PKG_BUILD_DIR)/wlcompat.o | ||||||
|  |   AUTOLOAD:=$(call AutoLoad,50,wlcompat) | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-wlcompat-debug | define KernelPackage/wlcompat-debug | ||||||
|   $(call Package/kmod-wlcompat/Default) |   $(call KernelPackage/wlcompat/Default) | ||||||
|   TITLE+= (debug) |   TITLE+= (debug) | ||||||
|   DESCRIPTION+=\\\ |   DESCRIPTION+=\\\ | ||||||
| 	\\\ | 	\\\ | ||||||
| 	This is a debugging version. | 	This is a debugging version. | ||||||
|  |   FILES:=$(PKG_BUILD_DIR)/wlcompat-debug.o | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Build/Prepare | define Build/Prepare | ||||||
| @@ -60,17 +63,5 @@ define Build/Compile | |||||||
| 		modules | 		modules | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/kmod-wlcompat/install | $(eval $(call KernelPackage,wlcompat)) | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) | $(eval $(call KernelPackage,wlcompat-debug)) | ||||||
| 	$(CP) $(PKG_BUILD_DIR)/wlcompat.o $(1)/lib/modules/$(LINUX_VERSION)/ |  | ||||||
| 	$(INSTALL_DIR) $(1)/etc/modules.d |  | ||||||
| 	echo "wlcompat" > $(1)/etc/modules.d/30-wlcompat |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/kmod-wlcompat-debug/install |  | ||||||
| 	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) |  | ||||||
| 	$(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(1)/lib/modules/$(LINUX_VERSION)/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,kmod-wlcompat)) |  | ||||||
| $(eval $(call BuildPackage,kmod-wlcompat-debug)) |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau