diff --git a/debian/changelog b/debian/changelog index 580bcc877..1d42f08fb 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 7b2d9eb61..000000000 --- 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 f17ce5616..896a8142c 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 001879357..6cdea7c3e 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 e4433be03..c534607e6 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: -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: Architecture: linux-any