projects / packages.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
miniupnpc: security update to 1.8
[packages.git] / net / usbip / Makefile
diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index 7b00150..740cf48 100644 (file)
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,135 +9,97 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=usbip
-PKG_VERSION:=0.1.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/usbip
-PKG_MD5SUM:=d1094b6d4449787864f8be001639232c
+PKG_RELEASE:=2
+
+# Since kernel 2.6.39.1 userspace tools are inside the kernel tree
+# Package Automatic match version in kernel
+# MD5SUM is not useful kernel package already check it
+PKG_VERSION:=$(shell  sed -n -e '/^AC_INIT/s/.*\[\([[:digit:]\.]*\)\].*/\1/gp' $(LINUX_DIR)/drivers/staging/usbip/userspace/configure.ac)
+PKG_SOURCE:=
+PKG_SOURCE_URL:=
+PKG_MD5SUM:=unknown
+PATCH_DIR:=./patches-$(PKG_VERSION)
+
+define prepare_source_directory
+       rm -rf $(PKG_BUILD_DIR)
+       $(CP) $(LINUX_DIR)/drivers/staging/usbip/userspace $(PKG_BUILD_DIR)
+endef
+Hooks/Prepare/Pre += prepare_source_directory
 
-PKG_FIXUP:=libtool
+PKG_BUILD_DEPENDS:=glib2 sysfsutils
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/usbip/Common
   TITLE:=USB-over-IP
   URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT
+  MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef
 
 define Package/usbip/Default
-$(call Package/usbip/Common)
+  $(call Package/usbip/Common)
   SECTION:=net
   CATEGORY:=Network
 endef
 
 define Package/usbip
-$(call Package/usbip/Default)
+  $(call Package/usbip/Default)
   TITLE+= (common)
-  DEPENDS+= +glib2 +sysfsutils +libwrap
+  DEPENDS+= +libsysfs +libwrap +kmod-usbip
 endef
 
 define Package/usbip-client
-$(call Package/usbip/Default)
+  $(call Package/usbip/Default)
   TITLE+= (client)
-  DEPENDS+= +usbip +kmod-usbip-client
+  DEPENDS+= usbip +glib2 +kmod-usbip-client
 endef
 
 define Package/usbip-server
-$(call Package/usbip/Default)
+  $(call Package/usbip/Default)
   TITLE+= (server)
-  DEPENDS+= +usbip +kmod-usbip-server
-endef
-
-define KernelPackage/usbip/Default
-$(call Package/usbip/Common)
-  SUBMENU:=USB Support
-endef
-
-define KernelPackage/usbip
-$(call KernelPackage/usbip/Default)
-  TITLE+= (kernel support)
-  KCONFIG:= USB_IP_COMMON=m
-  FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip_common_mod.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,98,usbip_common_mod)
+  DEPENDS+= usbip usbip-client +glib2 +kmod-usbip-server
 endef
 
-define KernelPackage/usbip-client
-$(call KernelPackage/usbip/Default)
-  SUBMENU:=USB Support
-  TITLE+= (kernel client driver)
-  DEPENDS+= +kmod-usbip
-  KCONFIG:= USB_IP_VHCI_HCD=m
-  FILES:=$(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,99,vhci-hcd)
-endef
-
-define KernelPackage/usbip-server
-$(call KernelPackage/usbip/Default)
-  SUBMENU:=USB Support
-  TITLE+= (kernel host driver)
-  DEPENDS+= +kmod-usbip
-  KCONFIG:= USB_IP_HOST=m
-  FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,99,usbip)
-endef
+CONFIGURE_PATH:=.
+MAKE_PATH:=.
+LIBTOOL_PATHS:=.
+MAKE_FLAGS+=CFLAGS="-Wno-implicit-function-declaration"
 
-include $(INCLUDE_DIR)/kernel-defaults.mk
-
-CONFIGURE_PATH:=./src
-MAKE_PATH:=./src
-LIBTOOL_PATHS:=./src
-
-define Build/Prepare
-$(call Build/Prepare/Default)
-       (cd $(PKG_BUILD_DIR)/src; [ -x ./configure ] || ./autogen.sh )
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); ./autogen.sh );
+       $(call Build/Configure/Default)
 endef
 
-define Build/Compile/kmod
-       $(MAKE) $(KERNEL_MAKEOPTS) \
-               SUBDIRS="$(LINUX_DIR)/drivers/staging/usbip" \
-               CONFIG_USB_IP_COMMON=m \
-               CONFIG_USB_IP_VHCI_HCD=m \
-               CONFIG_USB_IP_HOST=m \
-               modules
-endef
+CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
 
-define Build/Compile
-$(call Build/Compile/Default)
-$(call Build/Compile/kmod)
+define Download/usb.ids
+  URL:=http://www.linux-usb.org/
+  FILE:=usb.ids
+  MD5SUM:=
 endef
 
 define Package/usbip/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libusbip.so.* \
-               $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/share/usbip
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/share/usbip/usb.ids \
-               $(1)/usr/share/usbip/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbip.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/share/hwdata
+       $(CP) $(DL_DIR)/usb.ids $(1)/usr/share/hwdata/
 endef
 
 define Package/usbip-client/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/bin/usbip \
-               $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbip $(1)/usr/sbin/
 endef
 
 define Package/usbip-server/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/bin/bind_driver \
-               $(PKG_INSTALL_DIR)/usr/bin/usbipd \
-               $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbipd $(1)/usr/sbin/
 endef
 
+$(eval $(call Download,usb.ids))
 $(eval $(call BuildPackage,usbip))
 $(eval $(call BuildPackage,usbip-client))
 $(eval $(call BuildPackage,usbip-server))
-$(eval $(call KernelPackage,usbip))
-$(eval $(call KernelPackage,usbip-client))
-$(eval $(call KernelPackage,usbip-server))
Repository of old unmaintained packages