lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 409/879] samples: bpf: Dont fail for a missing VMLINUX_BTF when VMLINUX_H is provided
    Date
    From: Jerome Marchand <jmarchan@redhat.com>

    [ Upstream commit ec24704492d8791a52a75a39e3ad762b6e017bc6 ]

    samples/bpf build currently always fails if it can't generate
    vmlinux.h from vmlinux, even when vmlinux.h is directly provided by
    VMLINUX_H variable, which makes VMLINUX_H pointless.
    Only fails when neither method works.

    Fixes: 384b6b3bbf0d ("samples: bpf: Add vmlinux.h generation support")
    Reported-by: CKI Project <cki-project@redhat.com>
    Reported-by: Veronika Kabatova <vkabatov@redhat.com>
    Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Link: https://lore.kernel.org/bpf/20220507161635.2219052-1-jmarchan@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    samples/bpf/Makefile | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
    index 38638845db9d..72bb85c18804 100644
    --- a/samples/bpf/Makefile
    +++ b/samples/bpf/Makefile
    @@ -368,16 +368,15 @@ VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))

    $(obj)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL)
    ifeq ($(VMLINUX_H),)
    +ifeq ($(VMLINUX_BTF),)
    + $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)",\
    + build the kernel or set VMLINUX_BTF or VMLINUX_H variable)
    +endif
    $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@
    else
    $(Q)cp "$(VMLINUX_H)" $@
    endif

    -ifeq ($(VMLINUX_BTF),)
    - $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)",\
    - build the kernel or set VMLINUX_BTF variable)
    -endif
    -
    clean-files += vmlinux.h

    # Get Clang's default includes on this system, as opposed to those seen by
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 02:19    [W:4.110 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site