Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usbip: use new usbids package

Browse source 
It's more consistent since it installs to the same place.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-12-29 20:59:57 -08:00
parent 6f4daa04da
commit 71cb006920
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/usbip/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=usbip
PKG_RELEASE:=12
PKG_RELEASE:=13
PKG_LICENSE:=GPL-2.0-only
# Since kernel 2.6.39.1 userspace tools are inside the kernel tree
@ -52,7 +52,7 @@ endef
define Package/usbip
$(call Package/usbip/Default)
TITLE+= (common)
DEPENDS+= +libwrap +kmod-usbip +libudev +USE_GLIBC:libbsd
DEPENDS+= +libwrap +kmod-usbip +libudev +USE_GLIBC:libbsd +usbids
endef
define Package/usbip-client
@ -80,20 +80,9 @@ endef
CONFIGURE_VARS+= $(if $(CONFIG_USE_GLIBC),LIBS='-lbsd -lpthread')
CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
USB_IDS_VER:=0.318
USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
define Download/usb.ids
FILE:=$(USB_IDS_FILE)
URL_FILE:=usb.ids
URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
HASH:=84bc5452e4e45c2250e01bc74e03528b2a53c4724b2c4a5feaea76a922f83915
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/hwdata
$(CP) $(DL_DIR)/usb.ids.$(USB_IDS_VER) $(1)/usr/share/hwdata/usb.ids
endef
define Package/usbip-client/install
@ -106,7 +95,6 @@ define Package/usbip-server/install
$(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))