UBUNTU: [Debian] usbip tools packaging

BugLink: http://bugs.launchpad.net/bugs/898003
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules b/debian/rules
index 33bf75d899241a8dce041609b089f565f76a1a23..0d976809b9359721de9a03575ede79e8977e9cda 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ include $(DROOT)/rules.d/0-common-vars.mk
 # Maintainer targets
 include $(DROOT)/rules.d/1-maintainer.mk
 
-do_linux_tools=$(sort $(filter-out false,$(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
+do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
 do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
 
 # Don't build tools in a cross compile environment.

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index ccce6666d6321819abed65430592e3d8b959ff75..fe2bd68db4b8e6daad0453dd58b4e5e7d0b483fc 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -300,6 +300,10 @@ endif
 ifeq ($(do_linux_tools),true)
        # Create the linux-tools tool links
        install -d $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
+ifeq ($(do_tools_usbip),true)
+       ln -s ../../$(src_pkg_name)-tools-$(abi_release)/usbip $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
+       ln -s ../../$(src_pkg_name)-tools-$(abi_release)/usbipd $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
+endif
 ifeq ($(do_tools_cpupower),true)
        ln -s ../../$(src_pkg_name)-tools-$(abi_release)/cpupower $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
 endif
@@ -516,6 +520,13 @@ endif
 $(stampdir)/stamp-build-perarch: $(stampdir)/stamp-prepare-perarch install-arch-headers
        @echo Debug: $@
 ifeq ($(do_linux_tools),true)
+ifeq ($(do_tools_usbip),true)
+       chmod 755 $(builddirpa)/tools/usb/usbip/autogen.sh
+       cd $(builddirpa)/tools/usb/usbip && ./autogen.sh
+       chmod 755 $(builddirpa)/tools/usb/usbip/configure
+       cd $(builddirpa)/tools/usb/usbip && ./configure --prefix=$(builddirpa)/tools/usb/usbip/bin
+       cd $(builddirpa)/tools/usb/usbip && make install CFLAGS="-g -O2 -static" CROSS_COMPILE=$(CROSS_COMPILE)
+endif
 ifeq ($(do_tools_cpupower),true)
        # Allow for multiple installed versions of cpupower and libcpupower.so:
        # Override LIB_MIN in order to to generate a versioned .so named
@@ -548,7 +559,12 @@ install-perarch: $(stampdir)/stamp-build-perarch
 ifeq ($(do_linux_tools),true)
        install -d $(toolspkgdir)/usr/lib
        install -d $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
-
+ifeq ($(do_tools_usbip),true)
+       install -m755 $(builddirpa)/tools/usb/usbip/bin/sbin/usbip \
+               $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
+       install -m755 $(builddirpa)/tools/usb/usbip/bin/sbin/usbipd \
+               $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
+endif
 ifeq ($(do_tools_cpupower),true)
        install -m755 $(builddirpa)/tools/power/cpupower/cpupower \
                $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index e1211dc2b4a3e98382bf285da138a16cfcb407d9..22b5bee6c854bc77a8c6856b3d40f18fd2146c1a 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -101,6 +101,9 @@ install-tools: install-source $(stampdir)/stamp-build-perarch
        install -d $(toolsbin)
        install -d $(toolsman)/man1
 
+       install -m755 debian/tools/generic $(toolsbin)/usbip
+       install -m644 $(CURDIR)/tools/usb/usbip/doc/*.8 $(toolsman)/man1/
+
        install -m755 debian/tools/generic $(toolsbin)/cpupower
        install -m644 $(CURDIR)/tools/power/cpupower/man/*.1 $(toolsman)/man1/