UBUNTU: [Debian] sort out linux-tools naming

BugLink: http://bugs.launchpad.net/bugs/1205284Signed-off-by: Andy Whitcroft <apw@canonical.com>

debian/rules.d/0-common-vars.mk

@@ -170,6 +170,7 @@ else
 endif
 tools_pkg_name=$(src_pkg_name)-tools-$(abi_release)
 tools_common_pkg_name=$(src_pkg_name)-tools-common
+tools_flavour_pkg_name=linux-tools-$(abi_release)
 
 # The general flavour specific image package.
 do_flavour_image_package=true

debian/rules.d/2-binary-arch.mk

@@ -52,6 +52,7 @@ install-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
 install-%: bindoc = $(pkgdir)/usr/share/doc/$(bin_pkg_name)-$*
 install-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
 install-%: signed = $(CURDIR)/debian/$(bin_pkg_name)-signed
+install-%: toolspkgdir = $(CURDIR)/debian/$(tools_flavour_pkg_name)-$*
 install-%: basepkg = $(hdrs_pkg_name)
 install-%: indeppkg = $(indep_hdrs_pkg_name)
 install-%: kernfile = $(call custom_override,kernel_file,$*)
@@ -289,6 +290,10 @@ endif
 		$(pkgdir)/lib/modules/$(abi_release)-$*
 	rmdir $(pkgdir)/lib/modules/$(abi_release)-$*/_
 
+	# Create the linux-tools version-flavour link
+	install -d $(toolspkgdir)/usr/lib/linux-tools
+	ln -s ../$(src_pkg_name)-tools-$(abi_release) $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
+
 headers_tmp := $(CURDIR)/debian/tmp-headers
 headers_dir := $(CURDIR)/debian/linux-libc-dev
 
@@ -346,6 +351,7 @@ binary-%: pkgimg_ex = $(extra_pkg_name)-$*
 binary-%: pkghdr = $(hdrs_pkg_name)-$*
 binary-%: dbgpkg = $(bin_pkg_name)-$*-dbgsym
 binary-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
+binary-%: pkgtools = $(tools_flavour_pkg_name)-$*
 binary-%: target_flavour = $*
 binary-%: install-%
 	@echo Debug: $@
@@ -432,6 +438,19 @@ ifneq ($(skipdbg),true)
 	# Now, the package wont get into the archive, but it will get put
 	# into the debug system.
 endif
+
+ifeq ($(do_tools),true)
+	dh_installchangelogs -p$(pkgtools)
+	dh_installdocs -p$(pkgtools)
+	dh_compress -p$(pkgtools)
+	dh_fixperms -p$(pkgtools)
+	dh_shlibdeps -p$(pkgtools)
+	dh_installdeb -p$(pkgtools)
+	$(lockme) dh_gencontrol -p$(pkgtools)
+	dh_md5sums -p$(pkgtools)
+	dh_builddeb -p$(pkgtools)
+endif
+
 ifneq ($(full_build),false)
 	# Clean out this flavours build directory.
 	rm -rf $(builddir)/build-$*
@@ -485,32 +504,30 @@ install-perarch: $(stampdir)/stamp-build-perarch
 	@echo Debug: $@
 	# Add the tools.
 ifeq ($(do_tools),true)
-	install -d $(toolspkgdir)/usr/bin
 	install -d $(toolspkgdir)/usr/lib
+	install -d $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 
 	install -m755 $(builddirpa)/tools/power/cpupower/cpupower \
-		$(toolspkgdir)/usr/bin/cpupower_$(abi_release)
+		$(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 	# Install only the full versioned libcpupower.so.$(abi_release), not
 	# the usual symlinks to it.
 	install -m644 $(builddirpa)/tools/power/cpupower/libcpupower.so.$(abi_release) \
 		$(toolspkgdir)/usr/lib/
 
 ifeq ($(do_tools_perf),true)
-	install -m755 $(builddirpa)/tools/perf/perf \
-		$(toolspkgdir)/usr/bin/perf_$(abi_release)
+	install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 endif
 ifeq ($(do_tools_x86),true)
 	install -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \
-		$(toolspkgdir)/usr/bin/x86_energy_perf_policy_$(abi_release)
+		$(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 	install -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \
-		$(toolspkgdir)/usr/bin/turbostat_$(abi_release)
+		$(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 endif
 ifeq ($(do_tools_hyperv),true)
-	install -d $(toolspkgdir)/usr/sbin
 	install -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \
-		$(toolspkgdir)/usr/sbin/hv_kvp_daemon_$(abi_release)
+		$(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 	install -m755 $(builddirpa)/tools/hv/hv_vss_daemon \
-		$(toolspkgdir)/usr/sbin/hv_vss_daemon_$(abi_release)
+		$(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 endif
 endif