lkml.org 
[lkml]   [2018]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 023/189] libbpf: Makefile set specified permission mode
    Date
    From: Jesper Dangaard Brouer <brouer@redhat.com>

    [ Upstream commit 7110d80d53f472956420cd05a6297f49b558b674 ]

    The third parameter to do_install was not used by $(INSTALL) command.
    Fix this by only setting the -m option when the third parameter is supplied.

    The use of a third parameter was introduced in commit eb54e522a000 ("bpf:
    install libbpf headers on 'make install'").

    Without this change, the header files are install as executables files (755).

    Fixes: eb54e522a000 ("bpf: install libbpf headers on 'make install'")
    Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    tools/lib/bpf/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
    index 4555304dc18e..f02448e86d38 100644
    --- a/tools/lib/bpf/Makefile
    +++ b/tools/lib/bpf/Makefile
    @@ -183,7 +183,7 @@ define do_install
    if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
    $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
    fi; \
    - $(INSTALL) $1 '$(DESTDIR_SQ)$2'
    + $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
    endef

    install_lib: all_cmd
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 06:09    [W:3.048 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site