diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2017-10-01 00:58:22 +0100 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-10-01 01:05:52 +0100 |
commit | cc91d0cfa297d13322d5148fde52f2e2c7371f16 (patch) | |
tree | 9499d5110099d2158e4e6cfbacd9cb5b53e04a3d | |
parent | 604a4a57430ca6094fcb7827eb13998484a9db10 (diff) | |
download | kernel_replicant_linux-cc91d0cfa297d13322d5148fde52f2e2c7371f16.tar.gz kernel_replicant_linux-cc91d0cfa297d13322d5148fde52f2e2c7371f16.tar.bz2 kernel_replicant_linux-cc91d0cfa297d13322d5148fde52f2e2c7371f16.zip |
usbip: Stop building broken libusbip-dev package
It has a lintian error (non-empty-dependency_libs-in-la-file) and it
also seems to be missing a header (the newly added
usbip_host_common.h) since Linux 4.7. No-one seems to have noticed,
and it has nothing build-depending on it, so get rid of it.
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/libusbip-dev.install | 3 | ||||
-rw-r--r-- | debian/rules.d/tools/usb/usbip/Makefile | 1 | ||||
-rw-r--r-- | debian/rules.real | 2 | ||||
-rw-r--r-- | debian/templates/control.tools.in | 11 |
5 files changed, 3 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 580bcc877242..1d42f08fb534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium profile is used * debian/control: Move many build dependencies to Build-Depends-Arch field * debian/control: Remove obsolete workarounds and alternate build deps + * usbip: Stop building broken libusbip-dev package [ Uwe Kleine-König ] * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin diff --git a/debian/libusbip-dev.install b/debian/libusbip-dev.install deleted file mode 100644 index 7b2d9eb615d0..000000000000 --- a/debian/libusbip-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libusbip.la -usr/lib/libusbip.a -usr/include/usbip/* diff --git a/debian/rules.d/tools/usb/usbip/Makefile b/debian/rules.d/tools/usb/usbip/Makefile index f17ce56166af..896a8142c80f 100644 --- a/debian/rules.d/tools/usb/usbip/Makefile +++ b/debian/rules.d/tools/usb/usbip/Makefile @@ -17,6 +17,7 @@ all: --with-tcp-wrappers \ --with-usbids-dir=/usr/share/misc \ --disable-shared \ + --disable-static \ --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) $(MAKE) diff --git a/debian/rules.real b/debian/rules.real index 001879357caa..6cdea7c3e340 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -616,7 +616,7 @@ install-perf: $(STAMPS_DIR)/build-tools dh_md5sums dh_builddeb -install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip +install-usbip: DH_OPTIONS = -pusbip install-usbip: DIR = $(CURDIR)/debian/usbip-tmp install-usbip: $(STAMPS_DIR)/build-tools dh_testdir diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in index e4433be03510..c534607e6409 100644 --- a/debian/templates/control.tools.in +++ b/debian/templates/control.tools.in @@ -54,17 +54,6 @@ Description: Performance analysis tools for Linux @version@ The linux-base package contains a 'perf' command which will invoke the appropriate version for the running kernel. -Package: libusbip-dev -Build-Profiles: <!stage1 !pkg.linux.notools> -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 Build-Profiles: <!stage1 !pkg.linux.notools> Architecture: linux-any |