lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 096/221] libbpf: Fix INSTALL flag order
    Date
    From: Georgi Valkov <gvalkov@abv.bg>

    [ Upstream commit e7fb6465d4c8e767e39cbee72464e0060ab3d20c ]

    It was reported ([0]) that having optional -m flag between source and
    destination arguments in install command breaks bpftools cross-build
    on MacOS. Move -m to the front to fix this issue.

    [0] https://github.com/openwrt/openwrt/pull/3959

    Fixes: 7110d80d53f4 ("libbpf: Makefile set specified permission mode")
    Signed-off-by: Georgi Valkov <gvalkov@abv.bg>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20210308183038.613432-1-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 55bd78b3496f..310f647c2d5b 100644
    --- a/tools/lib/bpf/Makefile
    +++ b/tools/lib/bpf/Makefile
    @@ -236,7 +236,7 @@ define do_install
    if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
    $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
    fi; \
    - $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
    + $(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2'
    endef

    install_lib: all_cmd
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-29 10:39    [W:4.052 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site