From patchwork Mon Jan 14 19:51:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 211873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 0CABB2C00A9 for ; Tue, 15 Jan 2013 06:51:18 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Tuq3n-0002OV-Sg; Mon, 14 Jan 2013 19:51:07 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Tuq3l-0002O6-MU for kernel-team@lists.ubuntu.com; Mon, 14 Jan 2013 19:51:06 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 7F8CB3340E2 for ; Mon, 14 Jan 2013 11:51:03 -0800 (PST) Received: by salmon.rtg.net (Postfix, from userid 1000) id 23A66209EF; Mon, 14 Jan 2013 12:51:03 -0700 (MST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Precise LTS SRU] UBUNTU: [Config] Build binary dependent tools package Date: Mon, 14 Jan 2013 12:51:02 -0700 Message-Id: <1358193063-103859-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1088454 Signed-off-by: Tim Gardner --- 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)