From e66f5b2a38e377568edc6ddf775637727eb96035 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 22 Sep 2014 07:46:32 -0600 Subject: [PATCH] UBUNTU: [Debian] usbip tools packaging BugLink: http://bugs.launchpad.net/bugs/898003 Signed-off-by: Tim Gardner --- debian/rules | 2 +- debian/rules.d/2-binary-arch.mk | 18 +++++++++++++++++- debian/rules.d/3-binary-indep.mk | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 33bf75d89924..0d976809b935 100755 --- 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 ccce6666d632..fe2bd68db4b8 100644 --- 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 e1211dc2b4a3..22b5bee6c854 100644 --- 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/ -- 2.39.5