NAK Re: [PATCH] UBUNTU: [Packaging] do not attempt to generate BTF header on armhf

[Timo Aaltonen]

Luca Boccassi kirjoitti 22.8.2024 klo 16.12:
> On Thu, 22 Aug 2024 at 14:04, Timo Aaltonen <tjaalton at ubuntu.com> wrote:
>>
>> luca.boccassi at gmail.com kirjoitti 21.8.2024 klo 13.13:
>>> From: Luca Boccassi <bluca at debian.org>
>>>
>>> BugLink: https://bugs.launchpad.net/bugs/2050083
>>>
>>> armhf does not have working BTF for now, so create an empty header file
>>> like Debian does for now, to be dropped once that issue is fixed.
>>>
>>> Follow-up for 60df5eb6035b53143695d8e6a6bff62a05fd0884
>>>
>>> Signed-off-by: Luca Boccassi <bluca at debian.org>
>>> ---
>>>    debian/rules.d/2-binary-arch.mk | 5 +++++
>>>    1 file changed, 5 insertions(+)
>>>
>>> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
>>> index 792276bf8458..5486ceb672f8 100644
>>> --- a/debian/rules.d/2-binary-arch.mk
>>> +++ b/debian/rules.d/2-binary-arch.mk
>>> @@ -659,7 +659,12 @@ ifeq ($(do_tools_perf),true)
>>>    endif
>>>        mv $(builddirpa)/tools/bpf/bpftool/vmlinux $(builddirpa)/vmlinux
>>>        $(kmake) NO_LIBTRACEEVENT=1 CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
>>> +     # TODO: armhf does not have working BTF, so ship a stub header for now, can be removed once it's fixed
>>> +ifneq ($(arch),armhf)
>>>        $(builddirpa)/tools/bpf/bpftool/bpftool btf dump file $(builddirpa)/vmlinux format c > $(builddirpa)/vmlinux.h
>>> +else
>>> +     echo '#error "Kernel does not support CONFIG_DEBUG_INFO_BTF"' > $(builddirpa)/vmlinux.h
>>> +endif
>>>        rm -f $(builddirpa)/vmlinux
>>>    ifeq ($(do_tools_x86),true)
>>>        cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE)
>>
>>
>> Please amend the previous patch (which is dropped now), and protect this
>> (and the other parts) checking for 'do_tools_bpftool' instead of
>> hardcoding the arch here.
> 
> Ok - is https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/oracular
> the right git repository to use to base this on? If not, would you be
> able to please link the right repo and branch? Thanks

yes, updated now with 6.11.0-4.4 on top on master-next branch




-- 
t