[kernel] r19666 - in dists/trunk/linux-tools: . debian debian/bin debian/build debian/build/drivers debian/build/drivers/staging/usbip debian/build/scripts debian/build/scripts/basic debian/build/scripts/genksyms debian/build/scripts/kconfig debian/build/scripts/mod debian/build/tools/perf debian/patches debian/templates
Jonathan Nieder
jrnieder-guest at alioth.debian.org
Sun Dec 30 07:34:30 UTC 2012
Author: jrnieder-guest
Date: Sun Dec 30 07:34:29 2012
New Revision: 19666
Log:
Merge changes from sid up to 3.2.17-1
Added:
dists/trunk/linux-tools/debian/build/drivers/
- copied from r19192, dists/sid/linux-tools/debian/build/drivers/
dists/trunk/linux-tools/debian/libusbip-dev.install
- copied unchanged from r19192, dists/sid/linux-tools/debian/libusbip-dev.install
dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch
- copied, changed from r19192, dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch
dists/trunk/linux-tools/debian/patches/usbip-update-man-pages.patch
- copied, changed from r19192, dists/sid/linux-tools/debian/patches/usbip-update-man-pages.patch
dists/trunk/linux-tools/debian/usbip.install
- copied unchanged from r19192, dists/sid/linux-tools/debian/usbip.install
Modified:
dists/trunk/linux-tools/ (props changed)
dists/trunk/linux-tools/debian/ (props changed)
dists/trunk/linux-tools/debian/bin/gencontrol.py
dists/trunk/linux-tools/debian/bin/genorig.py
dists/trunk/linux-tools/debian/build/Makefile
dists/trunk/linux-tools/debian/build/drivers/staging/usbip/ (props changed)
dists/trunk/linux-tools/debian/build/scripts/ (props changed)
dists/trunk/linux-tools/debian/build/scripts/basic/ (props changed)
dists/trunk/linux-tools/debian/build/scripts/genksyms/ (props changed)
dists/trunk/linux-tools/debian/build/scripts/kconfig/ (props changed)
dists/trunk/linux-tools/debian/build/scripts/mod/ (props changed)
dists/trunk/linux-tools/debian/build/tools/perf/ (props changed)
dists/trunk/linux-tools/debian/changelog
dists/trunk/linux-tools/debian/patches/series
dists/trunk/linux-tools/debian/rules.real
dists/trunk/linux-tools/debian/templates/control.main.in
dists/trunk/linux-tools/debian/templates/control.source.in
Modified: dists/trunk/linux-tools/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-tools/debian/bin/gencontrol.py Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/bin/gencontrol.py Sun Dec 30 07:34:29 2012 (r19666)
@@ -39,6 +39,7 @@
def do_main_setup(self, vars, makeflags):
makeflags.update({
'VERSION': self.version.linux_version,
+ 'VERSION_DEBIAN': self.version.complete,
'UPSTREAMVERSION': self.version.linux_upstream,
})
Modified: dists/trunk/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-tools/debian/bin/genorig.py Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/bin/genorig.py Sun Dec 30 07:34:29 2012 (r19666)
@@ -145,6 +145,7 @@
'arch/*/Makefile',
'arch/x86/lib/memcpy_64.S',
'arch/x86/lib/memset_64.S',
+ 'drivers/staging/usbip/userspace/',
'include/',
'lib/rbtree.c',
'scripts/',
Modified: dists/trunk/linux-tools/debian/build/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/build/Makefile Sun Dec 30 07:34:29 2012 (r19666)
@@ -3,6 +3,7 @@
Makefile \
SUBDIRS = \
+ drivers/staging/usbip \
scripts \
tools
Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/changelog Sun Dec 30 07:34:29 2012 (r19666)
@@ -1,3 +1,7 @@
+linux-tools (3.7.1-1~experimental.2) UNRELEASED; urgency=low
+
+ -- Jonathan Nieder <jrnieder at gmail.com> Sat, 29 Dec 2012 22:51:43 -0800
+
linux-tools (3.7.1-1~experimental.1) experimental; urgency=low
* New upstream release
@@ -47,6 +51,24 @@
-- Ben Hutchings <ben at decadent.org.uk> Sat, 24 Mar 2012 23:15:59 +0000
+linux-tools (3.2.17-1) unstable; urgency=low
+
+ * New upstream stable updates:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.15
+ - modpost: fix ALL_INIT_DATA_SECTIONS
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.16
+ - perf hists: Catch and handle out-of-date hist entry maps.
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.17
+ - 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
+ * usbipd: Enable TCP wrappers for access control
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 24 Jun 2012 02:52:26 +0100
+
linux-tools (3.2.7-2) unstable; urgency=high
* Apply upstream changes to fix various buffer overflow bugs:
Copied: dists/trunk/linux-tools/debian/libusbip-dev.install (from r19192, dists/sid/linux-tools/debian/libusbip-dev.install)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/libusbip-dev.install Sun Dec 30 07:34:29 2012 (r19666, copy of r19192, dists/sid/linux-tools/debian/libusbip-dev.install)
@@ -0,0 +1,3 @@
+usr/lib/libusbip.la
+usr/lib/libusbip.a
+usr/include/usbip/*
Modified: dists/trunk/linux-tools/debian/patches/series
==============================================================================
--- dists/trunk/linux-tools/debian/patches/series Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/patches/series Sun Dec 30 07:34:29 2012 (r19666)
@@ -1,3 +1,5 @@
modpost-symbol-prefix.patch
tools-perf-version.patch
tools-perf-install.patch
+usbip-update-man-pages.patch
+usbip-document-tcp-wrappers.patch
Copied and modified: dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch (from r19192, dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch)
==============================================================================
--- dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch Sun Jun 24 02:11:08 2012 (r19192, copy source)
+++ dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch Sun Dec 30 07:34:29 2012 (r19666)
@@ -15,7 +15,7 @@
.SH OPTIONS
.HP
-@@ -39,7 +40,8 @@
+@@ -44,7 +45,8 @@
.B usbipd
offers no authentication or authorization for USB/IP. Any
Copied and modified: dists/trunk/linux-tools/debian/patches/usbip-update-man-pages.patch (from r19192, dists/sid/linux-tools/debian/patches/usbip-update-man-pages.patch)
==============================================================================
--- dists/sid/linux-tools/debian/patches/usbip-update-man-pages.patch Sun Jun 24 02:11:08 2012 (r19192, copy source)
+++ dists/trunk/linux-tools/debian/patches/usbip-update-man-pages.patch Sun Dec 30 07:34:29 2012 (r19666)
@@ -12,88 +12,3 @@
-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
---- a/drivers/staging/usbip/userspace/doc/usbip.8
-+++ b/drivers/staging/usbip/userspace/doc/usbip.8
-@@ -67,5 +67,4 @@
- - Detach the usb device.
-
- .SH "SEE ALSO"
--\fBusbipd\fP\fB(8)\fB\fP,
--\fBusbip_attach_driver\fP\fB(8)\fB\fP
-+\fBusbipd\fP\fB(8)\fB\fP
---- a/drivers/staging/usbip/userspace/doc/usbipd.8
-+++ b/drivers/staging/usbip/userspace/doc/usbipd.8
-@@ -10,7 +10,7 @@
- provides USB/IP clients access to exported USB devices.
-
- Devices have to explicitly be exported using
--.B usbip_bind_driver
-+.B usbip bind
- before usbipd makes them available to other hosts.
-
- The daemon accepts connections from USB/IP clients
-@@ -48,15 +48,14 @@
- server:# usbipd -D
- - Start usbip daemon.
-
-- server:# usbip_bind_driver --list
-+ server:# usbip list
- - List driver assignments for usb devices.
-
-- server:# usbip_bind_driver --usbip 1-2
-+ server:# usbip bind -b 1-2
- - Bind usbip-host.ko to the device of busid 1-2.
- - A usb device 1-2 is now exportable to other hosts!
-- - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting and use the device locally.
-+ - Use 'usbip unbind -b 1-2' when you want to shutdown exporting and use the device locally.
-
- .SH "SEE ALSO"
--\fBusbip\fP\fB(8)\fB\fP,
--\fBusbip_attach_driver\fP\fB(8)\fB\fP
-+\fBusbip\fP\fB(8)\fB\fP
-
Modified: dists/trunk/linux-tools/debian/rules.real
==============================================================================
--- dists/trunk/linux-tools/debian/rules.real Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/rules.real Sun Dec 30 07:34:29 2012 (r19666)
@@ -5,7 +5,7 @@
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
-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
@@ -63,3 +63,24 @@
dh_md5sums
dh_builddeb
+install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip
+install-usbip: DIR = $(CURDIR)/debian/tmp
+install-usbip: override VERSION := $(shell sed -ne 's,^#define PACKAGE_VERSION "\(.*\)"$$,\1,p' $(BUILD_DIR)/drivers/staging/usbip/userspace/config.h)
+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
+ test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN)"
+ dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN)
+ dh_md5sums
+ dh_builddeb
Modified: dists/trunk/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.main.in Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/templates/control.main.in Sun Dec 30 07:34:29 2012 (r19666)
@@ -17,3 +17,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/trunk/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.source.in Sat Dec 29 18:02:45 2012 (r19665)
+++ dists/trunk/linux-tools/debian/templates/control.source.in Sun Dec 30 07:34:29 2012 (r19666)
@@ -6,6 +6,7 @@
Standards-Version: 3.9.2
Build-Depends:
debhelper (>> 7), python,
- asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto
+ asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto,
+ autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-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/
Copied: dists/trunk/linux-tools/debian/usbip.install (from r19192, dists/sid/linux-tools/debian/usbip.install)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/usbip.install Sun Dec 30 07:34:29 2012 (r19666, copy of r19192, dists/sid/linux-tools/debian/usbip.install)
@@ -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