From 1f3c0f9c54fc421c8c772da49eee79f58b9abc25 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 3 Nov 2013 20:17:52 +0000 Subject: [PATCH] kernel: fix dependencies of usb-eth-gadget Signed-off-by: Hauke Mehrtens SVN-Revision: 38638 --- package/kernel/linux/modules/usb.mk | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 1614419273..bec9f6bd8f 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -39,8 +39,8 @@ endef define KernelPackage/usb-gadget TITLE:=USB Gadget support KCONFIG:=CONFIG_USB_GADGET - FILES:= - AUTOLOAD:= + FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko + AUTOLOAD:=$(call AutoLoad,45,udc-core) DEPENDS:=@USB_GADGET_SUPPORT $(call AddDepends/usb) endef @@ -51,6 +51,21 @@ endef $(eval $(call KernelPackage,usb-gadget)) +define KernelPackage/usb-lib-composite + TITLE:=USB lib composite + KCONFIG:=CONFIG_USB_LIBCOMPOSITE + DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs @!LINUX_3_3 @!LINUX_3_6 + FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko + AUTOLOAD:=$(call AutoLoad,50,libcomposite) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-lib-composite/description + Lib Composite +endef + +$(eval $(call KernelPackage,usb-lib-composite)) + define KernelPackage/usb-eth-gadget TITLE:=USB Ethernet Gadget support @@ -58,7 +73,7 @@ define KernelPackage/usb-eth-gadget CONFIG_USB_ETH \ CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_EEM=y - DEPENDS:=+kmod-usb-gadget + DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko AUTOLOAD:=$(call AutoLoad,52,g_ether) $(call AddDepends/usb)