[EOAN][UNSTABLE][PATCH 1/1] UBUNTU: [Debian] package bpftool in linux-tools-common

[Quentin Monnet]

2019-08-30 11:27 UTC-0500 ~ Seth Forshee <seth.forshee at canonical.com>
> On Tue, Aug 27, 2019 at 12:32:53PM +0100, Quentin Monnet wrote:
>> 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 <quentin.monnet at netronome.com>
> 
> I see a couple of issues, please see below.
> 
>> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
>> index 04d677f8b717..863d4bcdf945 100644
>> --- a/debian.master/control.stub.in
>> +++ b/debian.master/control.stub.in
>> @@ -48,6 +48,7 @@ Build-Depends-Indep:
>>   asciidoc <!stage1>,
>>   python-sphinx <!stage1>,
>>   python-sphinx-rtd-theme <!stage1>,
>> + python-docutils <!stage1>,
> 
> This package depends on python2, and I think that we need to avoid
> introducing any new build dependencies on python2. Would
> python3-docutils work instead?

Yes, it also provides rst2man. I will update to python3-docutils.

> 
>> --- a/debian/rules.d/2-binary-arch.mk
>> +++ b/debian/rules.d/2-binary-arch.mk
>> @@ -379,6 +379,9 @@ ifeq ($(do_tools_perf_jvmti),true)
>>  	$(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
>>  endif
>>  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)-$*
>> @@ -659,6 +662,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
> 
> Shouldn't this set CROSS_COMPILE?

That's right, I missed it, thanks.

I will fix these two issues and repost a new version.

Thanks a lot,
Quentin