From patchwork Thu Apr 11 13:48:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1084045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44g2Sx1F86z9s7h; Thu, 11 Apr 2019 23:49:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hEa53-0006ok-5l; Thu, 11 Apr 2019 13:49:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hEa4z-0006oR-Po for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 13:49:25 +0000 Received: from [177.138.39.161] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hEa4z-0004ZU-1k for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 13:49:25 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [SRU disco 1/1] UBUNTU: [Packaging] Support building libperf-jvmti.so Date: Thu, 11 Apr 2019 10:48:42 -0300 Message-Id: <20190411134842.11730-2-cascardo@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190411134842.11730-1-cascardo@canonical.com> References: <20190411134842.11730-1-cascardo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1761379 Adds default-jdk-headless and java-common as Build-Depends, which will allow libperf-jvmti.so to be built. The library will be installed on the linux-tools package the same way other tools are installed. That allows a user to use the current kernel version as given by `uname -r` to find the library at /usr/lib/linux-tools/`uname -r`/libperf-jvmti.so, which will be a symlink to a version-specific library. Signed-off-by: Thadeu Lima de Souza Cascardo --- debian.master/control.stub.in | 2 ++ debian/rules.d/2-binary-arch.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 7076ac27e322..04d677f8b717 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -13,6 +13,8 @@ Build-Depends: libelf-dev , libnewt-dev , libiberty-dev , + default-jdk-headless , + java-common , rsync , libdw-dev , libpci-dev , diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b04c855f3cd8..8bc70b579d8f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -375,6 +375,7 @@ ifeq ($(do_tools_cpupower),true) endif ifeq ($(do_tools_perf),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif ifeq ($(do_tools_x86),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* @@ -691,6 +692,7 @@ ifeq ($(do_tools_cpupower),true) endif ifeq ($(do_tools_perf),true) install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) + install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(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 \