• Quentin Monnet's avatar
    bpf/preload: Clean up .gitignore and "clean-files" target · 5f52d47c
    Quentin Monnet authored
    kernel/bpf/preload/Makefile was recently updated to have it install
    libbpf's headers locally instead of pulling them from tools/lib/bpf. But
    two items still need to be addressed.
    
    First, the local .gitignore file was not adjusted to ignore the files
    generated in the new kernel/bpf/preload/libbpf output directory.
    
    Second, the "clean-files" target is now incorrect. The old artefacts
    names were not removed from the target, while the new ones were added
    incorrectly. This is because "clean-files" expects names relative to
    $(obj), but we passed the absolute path instead. This results in the
    output and header-destination directories for libbpf (and their
    contents) not being removed from kernel/bpf/preload on "make clean" from
    the root of the repository.
    
    This commit fixes both issues. Note that $(userprogs) needs not be added
    to "clean-files", because the cleaning infrastructure already accounts
    for it.
    
    Cleaning the files properly also prevents make from printing the
    following message, for builds coming after a "make clean":
    "make[4]: Nothing to be done for 'install_headers'."
    
    v2: Simplify the "clean-files" target.
    
    Fixes: bf607917 ("bpf: preload: Install libbpf headers when building")
    Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
    Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
    Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
    Link: https://lore.kernel.org/bpf/20211020094647.15564-1-quentin@isovalent.com
    5f52d47c
Makefile 1.24 KB