[kernel] r19177 - in dists/sid/linux-tools/debian: . bin build build/drivers build/drivers/staging build/drivers/staging/usbip patches templates
Ben Hutchings
benh at alioth.debian.org
Wed Jun 20 06:04:14 UTC 2012
Author: benh
Date: Wed Jun 20 06:04:10 2012
New Revision: 19177
Log:
Build usbip userland packages (Closes: #568362)
Do not build a shared library package; the API and ABI have changed
from libusbip0 but there has been no upstream soversion change.
Added:
dists/sid/linux-tools/debian/build/drivers/
dists/sid/linux-tools/debian/build/drivers/staging/
dists/sid/linux-tools/debian/build/drivers/staging/usbip/ (props changed)
dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile
dists/sid/linux-tools/debian/libusbip-dev.install
dists/sid/linux-tools/debian/patches/usbip-remove-usbip_bind_driver-man-page
dists/sid/linux-tools/debian/usbip.install
Modified:
dists/sid/linux-tools/debian/ (props changed)
dists/sid/linux-tools/debian/bin/genorig.py
dists/sid/linux-tools/debian/build/Makefile
dists/sid/linux-tools/debian/changelog
dists/sid/linux-tools/debian/patches/series
dists/sid/linux-tools/debian/rules.real
dists/sid/linux-tools/debian/templates/control.main.in
dists/sid/linux-tools/debian/templates/control.source.in
Modified: dists/sid/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/sid/linux-tools/debian/bin/genorig.py Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/bin/genorig.py Wed Jun 20 06:04:10 2012 (r19177)
@@ -145,6 +145,7 @@
'arch/*/include/',
'arch/*/Makefile',
'arch/x86/lib/memcpy_64.S',
+ 'drivers/staging/usbip/userspace/',
'include/',
'lib/rbtree.c',
'scripts/',
Modified: dists/sid/linux-tools/debian/build/Makefile
==============================================================================
--- dists/sid/linux-tools/debian/build/Makefile Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/build/Makefile Wed Jun 20 06:04:10 2012 (r19177)
@@ -3,6 +3,7 @@
Makefile \
SUBDIRS = \
+ drivers/staging/usbip \
scripts \
tools
Added: dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile Wed Jun 20 06:04:10 2012 (r19177)
@@ -0,0 +1,24 @@
+srcdir := $(top_srcdir)/drivers/staging/usbip/userspace
+
+# Make sure we don't override top_srcdir in the sub-make. 'unexport
+# top_srcdir' is *not* sufficient; nor is adding 'MAKEFLAGS=' to the
+# sub-make command line.
+unexport MAKEFLAGS
+
+all:
+ cd $(srcdir) && ./autogen.sh
+ mkdir -p userspace
+ cd userspace && $(srcdir)/configure \
+ --prefix=/usr \
+ --with-tcp-wrappers=no \
+ --with-usbids-dir=/usr/share/misc \
+ --disable-shared
+ $(MAKE) -C userspace
+
+install:
+ $(MAKE) -C userspace install
+
+clean:
+ rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing)
+ find $(srcdir)/ -name Makefile.in -delete
+ rm -rf userspace
Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/changelog Wed Jun 20 06:04:10 2012 (r19177)
@@ -9,6 +9,9 @@
- Perf: fix build breakage
* Fix version insertion in perf man pages
+ * Build usbip userland packages (Closes: #568362)
+ - Do not build a shared library package; the API and ABI have changed
+ from libusbip0 but there has been no upstream soversion change
-- Ben Hutchings <ben at decadent.org.uk> Sat, 09 Jun 2012 19:56:44 +0100
Added: dists/sid/linux-tools/debian/libusbip-dev.install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-tools/debian/libusbip-dev.install Wed Jun 20 06:04:10 2012 (r19177)
@@ -0,0 +1,3 @@
+usr/lib/libusbip.la
+usr/lib/libusbip.a
+usr/include/usbip/*
Modified: dists/sid/linux-tools/debian/patches/series
==============================================================================
--- dists/sid/linux-tools/debian/patches/series Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/patches/series Wed Jun 20 06:04:10 2012 (r19177)
@@ -1,3 +1,4 @@
modpost-symbol-prefix.patch
tools-perf-version.patch
tools-perf-install.patch
+usbip-remove-usbip_bind_driver-man-page
Added: dists/sid/linux-tools/debian/patches/usbip-remove-usbip_bind_driver-man-page
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-tools/debian/patches/usbip-remove-usbip_bind_driver-man-page Wed Jun 20 06:04:10 2012 (r19177)
@@ -0,0 +1,56 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: The usbip_bind_driver command was removed; remove the man page too
+
+--- a/drivers/staging/usbip/userspace/Makefile.am
++++ b/drivers/staging/usbip/userspace/Makefile.am
+@@ -3,4 +3,4 @@
+ include_HEADERS := $(addprefix libsrc/, \
+ usbip_common.h vhci_driver.h usbip_host_driver.h)
+
+-dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
++dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8)
+--- a/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
++++ /dev/null
+@@ -1,42 +0,0 @@
+-.TH USBIP_BIND_DRIVER "8" "February 2009" "usbip" "System Administration Utilities"
+-.SH NAME
+-usbip_bind_driver \- change driver binding for USB/IP
+-
+-.SH SYNOPSIS
+-.B usbip_bind_driver
+-[\fIoptions\fR]
+-
+-.SH DESCRIPTION
+-Driver bindings for USB devices can be changed using
+-this program. It is used to export and unexport USB
+-devices over USB/IP.
+-
+-.SH OPTIONS
+-.TP
+-\fB\-u\fR, \fB\-\-usbip\fR <busid>
+-Make a device exportable
+-.TP
+-\fB\-o\fR, \fB\-\-other\fR <busid>
+-Use a device by a local driver
+-.TP
+-\fB\-l\fR, \fB\-\-list\fR
+-Print usb devices and their drivers
+-.TP
+-\fB\-L\fR, \fB\-\-list2\fR
+-Print usb devices and their drivers in parseable mode
+-
+-.SH EXAMPLES
+-
+- server:# usbip_bind_driver --list
+- - List driver assignments for usb devices.
+-
+- server:# usbip_bind_driver --usbip 1-2
+- - Bind usbip-host.ko to the device of busid 1-2.
+- - A usb device 1-2 is now exportable to other hosts!
+-
+- server:# usbip_bind_driver --other 1-2
+- - Shutdown exporting and use the device locally.
+-
+-.SH "SEE ALSO"
+-\fBusbip\fP\fB(8)\fB\fP,
+-\fBusbipd\fP\fB(8)\fB\fP
Modified: dists/sid/linux-tools/debian/rules.real
==============================================================================
--- dists/sid/linux-tools/debian/rules.real Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/rules.real Wed Jun 20 06:04:10 2012 (r19177)
@@ -3,8 +3,10 @@
include debian/rules.defs
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+PACKAGE_VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Version: ,,p')
+USBIP_VERSION := 1.1.1+$(PACKAGE_VERSION)
-binary-arch: install-kbuild
+binary-arch: install-kbuild install-usbip
ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-tools
endif
@@ -57,3 +59,22 @@
dh_md5sums
dh_builddeb
+install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip
+install-usbip: DIR = $(CURDIR)/debian/tmp
+install-usbip: $(STAMPS_DIR)/build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -d
+ $(MAKE) -C $(BUILD_DIR)/drivers/staging/usbip install top_srcdir=$(CURDIR) DESTDIR=$(DIR)
+ dh_install
+ dh_installchangelogs
+ dh_installdocs
+ dh_lintian
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol -- -v$(USBIP_VERSION)
+ dh_md5sums
+ dh_builddeb
Modified: dists/sid/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.main.in Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/templates/control.main.in Wed Jun 20 06:04:10 2012 (r19177)
@@ -15,3 +15,35 @@
.
The linux-base package contains a 'perf' command which will invoke the
appropriate version for the running kernel.
+
+Package: libusbip-dev
+Architecture: linux-any
+Depends: ${misc:Depends}
+Section: libdevel
+Description: USB device sharing system over IP network (development files)
+ USB/IP is a system for sharing USB devices over the network.
+ .
+ This package provides headers for the libusbip library and
+ the library itself for static linking.
+
+Package: usbip
+Architecture: linux-any
+Depends: usbutils, ${shlibs:Depends}, ${misc:Depends}
+Section: admin
+Description: USB device sharing system over IP network
+ USB/IP is a system for sharing USB devices over the network.
+ .
+ To share USB devices between computers with their full
+ functionality, USB/IP encapsulates "USB requests" into IP
+ packets and transmits them between computers.
+ .
+ Original USB device drivers and applications can be used
+ for remote USB devices without any modification of them. A
+ computer can use remote USB devices as if they were
+ directly attached.
+ .
+ Currently USB/IP provides no access control or encryption.
+ It should only be used in trusted environments.
+ .
+ This package provides the server component 'usbipd' and the
+ client tool 'usbip'.
Modified: dists/sid/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.source.in Wed Jun 20 04:14:02 2012 (r19176)
+++ dists/sid/linux-tools/debian/templates/control.source.in Wed Jun 20 06:04:10 2012 (r19177)
@@ -6,6 +6,7 @@
Standards-Version: 3.9.2
Build-Depends:
debhelper (>> 7), python,
- asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto
+ asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto,
+ autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/
Added: dists/sid/linux-tools/debian/usbip.install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-tools/debian/usbip.install Wed Jun 20 06:04:10 2012 (r19177)
@@ -0,0 +1,4 @@
+usr/sbin/usbip
+usr/sbin/usbipd
+usr/share/man/man8/usbip.8
+usr/share/man/man8/usbipd.8
More information about the Kernel-svn-changes
mailing list