evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: usbip: userspace: remove usb.ids file

Browse source 
Inclusion of the usb.ids file is redundant. USBIDS_DIR is set in
configure.ac to a default of /usr/share/hwdata/. This can be
overridden using `./configure --with-usbids-dir=<dir>'.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
matt mooney 2011-06-16 02:24:57 -07:00 • committed by Greg Kroah-Hartman
parent d8bfbf6e0d
commit 7ddf1a0c48
3 changed files with 2 additions and 13230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/usbip/userspace/Makefile.am
View file

@ -4,8 +4,3 @@ include_HEADERS := $(addprefix libsrc/, \
usbip.h usbip_common.h vhci_driver.h stub_driver.h) usbip.h usbip_common.h vhci_driver.h stub_driver.h)
dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8) dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
if INSTALL_USBIDS
pkgdata_DATA := usb.ids
EXTRA_DIST := $(pkgdata_DATA)
endif

18
drivers/staging/usbip/userspace/configure.ac
View file

@ -85,26 +85,12 @@ AC_ARG_WITH([tcp-wrappers],
[AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])]) [AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])])
# Sets directory containing usb.ids. # Sets directory containing usb.ids.
USBIDS_DIR='${datadir}/usbip'
AC_ARG_WITH([usbids-dir], AC_ARG_WITH([usbids-dir],
[AS_HELP_STRING([--with-usbids-dir=DIR], [AS_HELP_STRING([--with-usbids-dir=DIR],
[where usb.ids is found (default ${datadir}/usbip)])], [where usb.ids is found (default /usr/share/hwdata/)])],
[USBIDS_DIR=$withval]) [USBIDS_DIR=$withval], [USBIDS_DIR="/usr/share/hwdata/"])
AC_SUBST([USBIDS_DIR]) AC_SUBST([USBIDS_DIR])
dnl FIXME: when disabled, empty directry is created
usbids=install
AC_ARG_ENABLE([usbids-install],
[AS_HELP_STRING([--enable-usbids-install],
[install usb.ids (default)])],
[AS_CASE([$enableval],
[yes], [usbids=install],
[no], [usbids=notinstall],
[AC_MSG_ERROR(
[bad value ${enableval} for --enable-usbids-install])]
)])
AM_CONDITIONAL([INSTALL_USBIDS], [test x$usbids = xinstall])
GLIB2_REQUIRED=2.6.0 GLIB2_REQUIRED=2.6.0
PKG_CHECK_MODULES([PACKAGE], [glib-2.0 >= $GLIB2_REQUIRED]) PKG_CHECK_MODULES([PACKAGE], [glib-2.0 >= $GLIB2_REQUIRED])
AC_SUBST([PACKAGE_CFLAGS]) AC_SUBST([PACKAGE_CFLAGS])

13209
drivers/staging/usbip/userspace/usb.ids
View file

File diff suppressed because it is too large Load diff