From patchwork Wed Jan 26 18:58:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1584637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=wSR9+wre; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JkY1n71Ccz9t5H for ; Thu, 27 Jan 2022 05:59:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nCnWH-0006w0-RT; Wed, 26 Jan 2022 18:59:49 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nCnVw-0006U5-Ju for kernel-team@lists.ubuntu.com; Wed, 26 Jan 2022 18:59:28 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id EA1A53F17B for ; Wed, 26 Jan 2022 18:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1643223567; bh=RVeKyZKbUJG7IYPEg4UL+VHdA6GGzg3lnjVIrqhODEU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wSR9+wreig66uA0NcEOn4hKDJbgmCgj65de75EvGzgAdrXoz4ret+HobCSGzibImn OFeQ9vEQqSHcCQNvsoh/cnWoij53DW9T5hfwYr43SZhIwpxitUhkOEtEYM2UM9HixH t+uIhsVzUj/AOGdvS21U7s9wMwislwNSEEOnTqzn0DDi5eEn30ritrMScZ7Zsi9I/5 KwM91oLyVJGToSibfPESgSpN4RlUjeNiiIm/cc/Inbo+hZzdRf3bYe7Dfg38qO0SL/ 3Tx1+43tZMue9qkr4dtIrQMv4hL+VsoTpR3lpsgAcwtVHfFBvD4GMW7YZp9atyPlpU R08Jt3F8xm7pw== Received: by mail-ej1-f72.google.com with SMTP id p8-20020a1709060e8800b006b39ade8c12so127955ejf.10 for ; Wed, 26 Jan 2022 10:59:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RVeKyZKbUJG7IYPEg4UL+VHdA6GGzg3lnjVIrqhODEU=; b=2aMy173t7pdPyeEGfWrty2/ml4K434UN0X7NAlo7aExxdkSMOcuNihJIoj2M9b9j4X hMkXDfIBuWcDYHg+LhU+daqlyJ/Ok52qHntO78QLwpiAM4qCtrhZzFN8CM+JOWUcn4sA t+PF3gcwC4bdU6d2AYtrZj1Pec1OW1lrnO75y1K6gictu1QqX0qJBEizb2LYOGNIq4ck h1F0jI1lQj/RMktRivzXJo4jRQxXW9wA9rnlDgJzdfYmjgT5NvZDXO27uGkYCDE4UZHT ygOF5PGqNElkGLwaGMZj0VciR7KvWHs2OHlzrTLQYZcxPtwSMv6HAo/zgkUYRf1kIumh 27Vg== X-Gm-Message-State: AOAM531t3xQN2jcp1GXyrOf9n+O7j2NOa4pdtNuNVhx+N8A8FT+C7PSk HpeIsd2AkB2POdm2QUph+bZBYT30cp1D7bjKovuDtSY/WvoLvNH+OSoZhnTyYHSqIXKwALy1hVN 4JyMtG2WhEcVi7v1ehBLRLpFmxTxEkHi+7VuNrk2KxA== X-Received: by 2002:a17:907:168d:: with SMTP id hc13mr63966ejc.303.1643223567238; Wed, 26 Jan 2022 10:59:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+M1yWHlaE43XhBlTM5YeNYA38OgeNEDKaErVk4QGpKddVnvnko1zL+2DE9n2rVvE0WnYuDQ== X-Received: by 2002:a17:907:168d:: with SMTP id hc13mr63956ejc.303.1643223566999; Wed, 26 Jan 2022 10:59:26 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-168-84.adslplus.ch. [188.155.168.84]) by smtp.gmail.com with ESMTPSA id u18sm7767903eje.37.2022.01.26.10.59.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 10:59:26 -0800 (PST) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [J/realtime][PATCH 15/15] UBUNTU: [Packaging] realtime: include rtla in tools package Date: Wed, 26 Jan 2022 19:58:12 +0100 Message-Id: <20220126185812.300679-16-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220126185812.300679-1-krzysztof.kozlowski@canonical.com> References: <20220126185812.300679-1-krzysztof.kozlowski@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/1959130 Include newly added rtla tool in tools package. The rtla will be compiled if perf is chosen (do_tools_perf). The rtla requires rst2man from python3-docutils during full build, so move the python3-docutils dependency to Build-Depends. The rtla depends on libtracefs v1.3.0 (in development). Signed-off-by: Krzysztof Kozlowski --- debian.realtime/control.stub.in | 5 ++++- debian/rules.d/2-binary-arch.mk | 4 ++++ debian/rules.d/3-binary-indep.mk | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian.realtime/control.stub.in b/debian.realtime/control.stub.in index dd0bea8b6c30..d37395171984 100644 --- a/debian.realtime/control.stub.in +++ b/debian.realtime/control.stub.in @@ -37,6 +37,10 @@ Build-Depends: curl , zstd [amd64 s390x] , dwarves [amd64 arm64 armhf ppc64el s390x] , + python3-docutils , + libtracefs-dev , + libtraceevent-dev , + libprocps-dev , Build-Depends-Indep: xmlto , docbook-utils , @@ -48,7 +52,6 @@ Build-Depends-Indep: python3-sphinx , python3-sphinx-rtd-theme , fontconfig , - python3-docutils , imagemagick , graphviz , dvipng , diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index d50461a5c043..5f953c7e38f5 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -385,6 +385,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)/rtla $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* ifeq ($(do_tools_perf_jvmti),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif @@ -705,6 +706,8 @@ ifeq ($(do_tools_perf),true) cd $(builddirpa) && $(kmake) prepare cd $(builddirpa)/tools/perf && \ $(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0 + cd $(builddirpa)/tools/tracing/rtla && \ + $(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0 endif ifeq ($(do_tools_bpftool),true) $(kmake) CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool @@ -749,6 +752,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/tracing/rtla/rtla $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) ifeq ($(do_tools_perf_jvmti),true) install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 0868ce04dfc3..acc68567dce6 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -118,6 +118,7 @@ ifeq ($(do_tools_common),true) install -m644 $(CURDIR)/tools/power/cpupower/man/*.1 $(toolsman)/man1/ install -m755 debian/tools/generic $(toolsbin)/perf + install -m755 debian/tools/generic $(toolsbin)/rtla install -m755 debian/tools/generic $(toolssbin)/bpftool make -C $(builddir)/tools/tools/bpf/bpftool doc