Patchwork [Precise,LTS,SRU] UBUNTU: [Config] Build binary dependent tools package

login
register
mail settings
Submitter Tim Gardner
Date Jan. 14, 2013, 7:51 p.m.
Message ID <1358193063-103859-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/211873/
State New
Headers show

Comments

Tim Gardner - Jan. 14, 2013, 7:51 p.m.
BugLink: http://bugs.launchpad.net/bugs/1088454

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.quantal/control.stub.in   |   12 ++++++++++++
 debian.quantal/rules.d/amd64.mk  |    2 +-
 debian.quantal/rules.d/i386.mk   |    2 +-
 debian/rules.d/0-common-vars.mk  |    2 +-
 debian/rules.d/3-binary-indep.mk |    2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
Brad Figg - Jan. 14, 2013, 8:09 p.m.
On 01/14/2013 11:51 AM, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/1088454
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.quantal/control.stub.in   |   12 ++++++++++++
>  debian.quantal/rules.d/amd64.mk  |    2 +-
>  debian.quantal/rules.d/i386.mk   |    2 +-
>  debian/rules.d/0-common-vars.mk  |    2 +-
>  debian/rules.d/3-binary-indep.mk |    2 +-
>  5 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.quantal/control.stub.in b/debian.quantal/control.stub.in
> index fdde0b4..369abaa 100644
> --- a/debian.quantal/control.stub.in
> +++ b/debian.quantal/control.stub.in
> @@ -18,3 +18,15 @@ Description: Header files related to Linux kernel version PKGVER
>   that want the latest kernel headers. Please read
>   /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
>  
> +Package: linux-tools-PKGVER-ABINUM
> +Architecture: i386 amd64
> +Section: devel
> +Priority: optional
> +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
> +Description: Linux kernel version specific tools for version PKGVER-ABINUM
> + This package provides the architecture dependant parts for kernel
> + version locked tools (such as perf and x86_energy_perf_policy) for
> + version PKGVER-ABINUM on
> + =HUMAN=.
> +
> +
> diff --git a/debian.quantal/rules.d/amd64.mk b/debian.quantal/rules.d/amd64.mk
> index 9d00768..2893d77 100644
> --- a/debian.quantal/rules.d/amd64.mk
> +++ b/debian.quantal/rules.d/amd64.mk
> @@ -12,6 +12,6 @@ uefi_signed     = true
>  skipabi		= true
>  skipmodule	= true
>  do_libc_dev_package=false
> -do_tools        = false
> +do_tools        = true
>  do_doc_package  = false
>  do_source_package=false
> diff --git a/debian.quantal/rules.d/i386.mk b/debian.quantal/rules.d/i386.mk
> index 3e82c65..a31bb29 100644
> --- a/debian.quantal/rules.d/i386.mk
> +++ b/debian.quantal/rules.d/i386.mk
> @@ -11,6 +11,6 @@ no_dumpfile	= true
>  skipabi		= true
>  skipmodule	= true
>  do_libc_dev_package=false
> -do_tools        = false
> +do_tools        = true
>  do_doc_package  = false
>  do_source_package=false
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index 17eed6a..fe9ff93 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -175,7 +175,7 @@ ifneq ($(wildcard $(CURDIR)/tools),)
>  else
>  	do_tools?=false
>  endif
> -tools_pkg_name=$(src_pkg_name)-tools-$(abi_release)
> +tools_pkg_name=linux-tools-$(abi_release)
>  tools_common_pkg_name=$(src_pkg_name)-tools-common
>  
>  # The general flavour specific image package.
> diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
> index 0eb9d18..0aa47b8 100644
> --- a/debian/rules.d/3-binary-indep.mk
> +++ b/debian/rules.d/3-binary-indep.mk
> @@ -90,7 +90,7 @@ install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin
>  install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man
>  install-tools: install-source $(stampdir)/stamp-build-perarch
>  	@echo Debug: $@
> -ifeq ($(do_tools),true)
> +ifeq ($(do_tools_common),true)
>  	dh_testdir
>  	dh_testroot
>  	dh_clean -k -p$(toolspkg)
>
Stefan Bader - Jan. 15, 2013, 10:19 a.m.
On 14.01.2013 20:51, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/1088454
> 

Maybe a bit more verbatim about what this does... think I gathered it now and it
seems ok.
Tim Gardner - Jan. 15, 2013, 12:39 p.m.

Patch

diff --git a/debian.quantal/control.stub.in b/debian.quantal/control.stub.in
index fdde0b4..369abaa 100644
--- a/debian.quantal/control.stub.in
+++ b/debian.quantal/control.stub.in
@@ -18,3 +18,15 @@  Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
+Package: linux-tools-PKGVER-ABINUM
+Architecture: i386 amd64
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
+Description: Linux kernel version specific tools for version PKGVER-ABINUM
+ This package provides the architecture dependant parts for kernel
+ version locked tools (such as perf and x86_energy_perf_policy) for
+ version PKGVER-ABINUM on
+ =HUMAN=.
+
+
diff --git a/debian.quantal/rules.d/amd64.mk b/debian.quantal/rules.d/amd64.mk
index 9d00768..2893d77 100644
--- a/debian.quantal/rules.d/amd64.mk
+++ b/debian.quantal/rules.d/amd64.mk
@@ -12,6 +12,6 @@  uefi_signed     = true
 skipabi		= true
 skipmodule	= true
 do_libc_dev_package=false
-do_tools        = false
+do_tools        = true
 do_doc_package  = false
 do_source_package=false
diff --git a/debian.quantal/rules.d/i386.mk b/debian.quantal/rules.d/i386.mk
index 3e82c65..a31bb29 100644
--- a/debian.quantal/rules.d/i386.mk
+++ b/debian.quantal/rules.d/i386.mk
@@ -11,6 +11,6 @@  no_dumpfile	= true
 skipabi		= true
 skipmodule	= true
 do_libc_dev_package=false
-do_tools        = false
+do_tools        = true
 do_doc_package  = false
 do_source_package=false
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 17eed6a..fe9ff93 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -175,7 +175,7 @@  ifneq ($(wildcard $(CURDIR)/tools),)
 else
 	do_tools?=false
 endif
-tools_pkg_name=$(src_pkg_name)-tools-$(abi_release)
+tools_pkg_name=linux-tools-$(abi_release)
 tools_common_pkg_name=$(src_pkg_name)-tools-common
 
 # The general flavour specific image package.
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 0eb9d18..0aa47b8 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -90,7 +90,7 @@  install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin
 install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man
 install-tools: install-source $(stampdir)/stamp-build-perarch
 	@echo Debug: $@
-ifeq ($(do_tools),true)
+ifeq ($(do_tools_common),true)
 	dh_testdir
 	dh_testroot
 	dh_clean -k -p$(toolspkg)