Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ddf1a0c authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: remove usb.ids file 



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: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d8bfbf6e

drivers/staging/usbip/userspace/Makefile.am

+0 −5
Original line number Diff line number Diff line
@@ -4,8 +4,3 @@ include_HEADERS := $(addprefix libsrc/, \ 
		     usbip.h usbip_common.h vhci_driver.h stub_driver.h)



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

drivers/staging/usbip/userspace/configure.ac

+2 −16
Original line number Diff line number Diff line
@@ -85,26 +85,12 @@ AC_ARG_WITH([tcp-wrappers], 
	       [AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])])



# Sets directory containing usb.ids.

USBIDS_DIR='${datadir}/usbip'

AC_ARG_WITH([usbids-dir],

	    [AS_HELP_STRING([--with-usbids-dir=DIR],

	       [where usb.ids is found (default ${datadir}/usbip)])],

	    [USBIDS_DIR=$withval])

	       [where usb.ids is found (default /usr/share/hwdata/)])],

	    [USBIDS_DIR=$withval], [USBIDS_DIR="/usr/share/hwdata/"])

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

PKG_CHECK_MODULES([PACKAGE], [glib-2.0 >= $GLIB2_REQUIRED])

AC_SUBST([PACKAGE_CFLAGS])

drivers/staging/usbip/userspace/usb.ids

deleted100644 → 0
+0 −13209

File deleted.

File size exceeds preview limit.

View file