From patchwork Fri Jul 19 15:09:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 1135655 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=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="ppXbR6gR"; dkim-atps=neutral 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 45tK96188qz9sBF; Tue, 23 Jul 2019 23:30:18 +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 1hpurs-0005YU-Na; Tue, 23 Jul 2019 13:30:12 +0000 Received: from mail-wm1-f67.google.com ([209.85.128.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hoUWG-0001ml-Tj for kernel-team@lists.ubuntu.com; Fri, 19 Jul 2019 15:10:00 +0000 Received: by mail-wm1-f67.google.com with SMTP id s3so29147438wms.2 for ; Fri, 19 Jul 2019 08:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/CQJmuaT3/hEAUQ+9Tfkr70QqEJecVTTxq9yrzLEPaM=; b=ppXbR6gRYlGsjDoocN/4dH9gnJ7guc0aoyHO5NSdE7e+YY8Vw1BKCPIAOQKhHHKcev xW8JfUjAQjKxL2KjnNLpDhXRj6yxzetqFEvqLalWP0pMmOwyIh6pUE1ScjFVhYvHId0V s9SmrRHRBMZhFG/DUwDY0jcO27WauWd4+JBp6JjlSmPBLUWhe/uPH5NlvUAewuOp4fSP qPNo1VdHxEvfKpZuZywtFA1+cpLB5KDltHFyaL+RJF62rjSlosCFM2P2S6BD4fQUCSDd kQf3iKJUmYAWM0bIRHNolp3zEd2BTJedtLj5HngCt6PmnQ1ULDkD/VcnSSerhPhXyIdl lSQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/CQJmuaT3/hEAUQ+9Tfkr70QqEJecVTTxq9yrzLEPaM=; b=rlfGcncsHD7gDw390U7Hb8UsliLbuFoTjpZxzz/Vgd4+zT/jmdLqncekKu4nDvhtDp E/S0mHgbMduWX30GHZVJcn2MTVzoSGtP02X9ppDaMRWsSPaYJWM8tDiMG8wQt64eEckF gurPjLZUanX9aY/FTPHJdhNtc062SQeGzUATOYU5h27qCRm7Eq6fu+nrJJtwzUQCgsAU TNLcY2LhFjol8ny6wpOpffJtHAWILXHnWxtUZOwSoOnuyxAVP70mNw3yIKvq1bdrSWrm WvxIvWm8QLGAscRrU1mdJ6dIvBigZLfVVNBvfWIE4W9UCzYpkkDdrqU0XfnoPBDPLmWQ Wp+A== X-Gm-Message-State: APjAAAWDSma4pvHO+SsgQhi7YycH7t2c40RNxlxJrNK8lDfiYCLnzbs5 K5Dh6QqoG9AemIuLRhmPyhkVQrNXUVg= X-Google-Smtp-Source: APXvYqwm6V1z0op3XaS4P5dgsU4lrFPiDfP9ZeVoMhzkZ3kLnzcilb8weT4SVb7t8W3Hiq5sO+OzZw== X-Received: by 2002:a1c:3587:: with SMTP id c129mr50415281wma.90.1563549000195; Fri, 19 Jul 2019 08:10:00 -0700 (PDT) Received: from cbtest32.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id j10sm49259757wrd.26.2019.07.19.08.09.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 08:09:59 -0700 (PDT) From: Quentin Monnet To: kernel-team@lists.ubuntu.com Subject: [bionic][PATCH 2/2] UBUNTU: [Debian] package bpftool in linux-tools-common Date: Fri, 19 Jul 2019 16:09:46 +0100 Message-Id: <20190719150946.5137-3-quentin.monnet@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190719150946.5137-1-quentin.monnet@netronome.com> References: <20190719150946.5137-1-quentin.monnet@netronome.com> X-Mailman-Approved-At: Tue, 23 Jul 2019 13:30:01 +0000 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: , Cc: oss-drivers@netronome.com, Nicolas Dichtel , Roman Gushchin , Daniel Borkmann MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1774815 bpftool is a debugging and introspection tool for BPF elements, developed by the BPF kernel community. Its source code is located in the kernel repository, at tools/bpf/bpftool. Package it in linux-tools and linux-tools-common. Along the binary, package manual pages and bash completion file. Note that the generated manual page bpf-helpers.7 is NOT packaged, as this one is now included in the man-pages repository. bpftool itself is installed under /usr/sbin/, to be consistent with its Makefile. Dependency python-docutils is added to Build-Depends-Indep, in order to provide rst2man which is necessary to build bpftool's manual pages. Signed-off-by: Quentin Monnet --- debian.master/control.stub.in | 1 + debian.master/rules.d/amd64.mk | 1 + debian.master/rules.d/arm64.mk | 1 + debian.master/rules.d/armhf.mk | 1 + debian.master/rules.d/i386.mk | 1 + debian.master/rules.d/ppc64el.mk | 1 + debian.master/rules.d/s390x.mk | 1 + debian/rules | 2 +- debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 9 +++++++++ debian/rules.d/3-binary-indep.mk | 12 +++++++++++- 11 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 2821ca85668c..f0120b16aa91 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -44,6 +44,7 @@ Build-Depends-Indep: asciidoc , python-sphinx , python-sphinx-rtd-theme , + python-docutils , Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/bionic XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index eeb51dea374b..bfb07bc9259b 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -13,6 +13,7 @@ uefi_signed = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true do_tools_x86 = true do_tools_hyperv = true do_tools_host = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 14c413282c69..c395d34a4e5f 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -15,6 +15,7 @@ do_extras_package = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true do_dtbs = true do_zfs = true diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index 6cabbf281e55..b42e987c2245 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -13,5 +13,6 @@ loader = grub do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true do_dtbs = true diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 8c470c4dab6a..b9be3a167513 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -12,6 +12,7 @@ no_dumpfile = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true do_tools_x86 = true do_tools_hyperv = true do_extras_package = true diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index 7faecd720dc7..d893af68f272 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -14,6 +14,7 @@ opal_signed = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true #do_flavour_image_package = false do_zfs = true diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index 5b468acdfe44..d51c17008abb 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -15,5 +15,6 @@ do_extras_package = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true +do_tools_bpftool = true do_zfs = true diff --git a/debian/rules b/debian/rules index fd3397c67996..cdc107941787 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ include $(DROOT)/rules.d/0-common-vars.mk # Maintainer targets include $(DROOT)/rules.d/1-maintainer.mk -do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86))) +do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_bpftool) $(do_tools_x86))) do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv))) do_tools_common?=true do_tools_host?=false diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 8144be29523e..e515965d6f73 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -84,6 +84,7 @@ printenv: @echo "do_linux_tools = $(do_linux_tools)" @echo " do_tools_cpupower = $(do_tools_cpupower)" @echo " do_tools_perf = $(do_tools_perf)" + @echo " do_tools_bpftool = $(do_tools_bpftool)" @echo " do_tools_x86 = $(do_tools_x86)" @echo " do_tools_host = $(do_tools_host)" @echo "do_cloud_tools = $(do_cloud_tools)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 9267d96fdf7e..eed74229e80e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -385,6 +385,9 @@ endif ifeq ($(do_tools_perf),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif +ifeq ($(do_tools_bpftool),true) + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/bpftool $(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)-$* $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/turbostat $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* @@ -649,6 +652,9 @@ ifeq ($(do_tools_perf),true) 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 PYTHON=python2.7 endif +ifeq ($(do_tools_bpftool),true) + $(kmake) -C $(builddirpa)/tools/bpf/bpftool +endif ifeq ($(do_tools_x86),true) cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE) cd $(builddirpa)/tools/power/x86/turbostat && make CROSS_COMPILE=$(CROSS_COMPILE) @@ -690,6 +696,9 @@ endif ifeq ($(do_tools_perf),true) install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif +ifeq ($(do_tools_bpftool),true) + install -m755 $(builddirpa)/tools/bpf/bpftool/bpftool $(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/lib/$(src_pkg_name)-tools-$(abi_release) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index b27275685612..e5c6bc0c2c8a 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -84,6 +84,7 @@ install-tools: toolspkg = $(tools_common_pkg_name) install-tools: toolsbin = $(CURDIR)/debian/$(toolspkg)/usr/bin install-tools: toolssbin = $(CURDIR)/debian/$(toolspkg)/usr/sbin install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man +install-tools: toolsbashcomp = $(CURDIR)/debian/$(toolspkg)/usr/share/bash-completion/completions install-tools: hosttoolspkg = $(hosttools_pkg_name) install-tools: hosttoolsbin = $(CURDIR)/debian/$(hosttoolspkg)/usr/bin install-tools: hosttoolsman = $(CURDIR)/debian/$(hosttoolspkg)/usr/share/man @@ -102,7 +103,10 @@ ifeq ($(do_tools_common),true) rsync -a tools/ $(builddir)/tools/tools/ install -d $(toolsbin) + install -d $(toolssbin) install -d $(toolsman)/man1 + install -d $(toolsman)/man8 + install -d $(toolsbashcomp) install -m755 debian/tools/generic $(toolsbin)/usbip install -m755 debian/tools/generic $(toolsbin)/usbipd @@ -113,6 +117,13 @@ ifeq ($(do_tools_common),true) install -m755 debian/tools/generic $(toolsbin)/perf + install -m755 debian/tools/generic $(toolssbin)/bpftool + make -C $(builddir)/tools/tools/bpf/bpftool doc + install -m644 $(builddir)/tools/tools/bpf/bpftool/Documentation/*.8 \ + $(toolsman)/man8 + install -m644 $(builddir)/tools/tools/bpf/bpftool/bash-completion/bpftool \ + $(toolsbashcomp) + install -m755 debian/tools/generic $(toolsbin)/x86_energy_perf_policy install -m755 debian/tools/generic $(toolsbin)/turbostat @@ -120,7 +131,6 @@ ifeq ($(do_tools_common),true) install -m644 $(builddir)/tools/tools/perf/Documentation/*.1 \ $(toolsman)/man1 - install -d $(toolsman)/man8 install -m644 $(CURDIR)/tools/power/x86/x86_energy_perf_policy/*.8 $(toolsman)/man8 install -m644 $(CURDIR)/tools/power/x86/turbostat/*.8 $(toolsman)/man8