|
Gary Lin |
7dd6b6 |
From: Georgi Valkov <gvalkov@abv.bg>
|
|
Gary Lin |
7dd6b6 |
Date: Mon, 8 Mar 2021 10:30:38 -0800
|
|
Gary Lin |
7dd6b6 |
Subject: libbpf: Fix INSTALL flag order
|
|
Gary Lin |
7dd6b6 |
Patch-mainline: v5.12-rc5
|
|
Gary Lin |
7dd6b6 |
Git-commit: e7fb6465d4c8e767e39cbee72464e0060ab3d20c
|
|
Gary Lin |
7dd6b6 |
References: bsc#1155518
|
|
Gary Lin |
7dd6b6 |
|
|
Gary Lin |
7dd6b6 |
It was reported ([0]) that having optional -m flag between source and
|
|
Gary Lin |
7dd6b6 |
destination arguments in install command breaks bpftools cross-build
|
|
Gary Lin |
7dd6b6 |
on MacOS. Move -m to the front to fix this issue.
|
|
Gary Lin |
7dd6b6 |
|
|
Gary Lin |
7dd6b6 |
[0] https://github.com/openwrt/openwrt/pull/3959
|
|
Gary Lin |
7dd6b6 |
|
|
Gary Lin |
7dd6b6 |
Fixes: 7110d80d53f4 ("libbpf: Makefile set specified permission mode")
|
|
Gary Lin |
7dd6b6 |
Signed-off-by: Georgi Valkov <gvalkov@abv.bg>
|
|
Gary Lin |
7dd6b6 |
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Gary Lin |
7dd6b6 |
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
Gary Lin |
7dd6b6 |
Link: https://lore.kernel.org/bpf/20210308183038.613432-1-andrii@kernel.org
|
|
Gary Lin |
7dd6b6 |
Acked-by: Gary Lin <glin@suse.com>
|
|
Gary Lin |
7dd6b6 |
---
|
|
Gary Lin |
7dd6b6 |
tools/lib/bpf/Makefile | 2 +-
|
|
Gary Lin |
7dd6b6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Gary Lin |
7dd6b6 |
|
|
Gary Lin |
7dd6b6 |
--- a/tools/lib/bpf/Makefile
|
|
Gary Lin |
7dd6b6 |
+++ b/tools/lib/bpf/Makefile
|
|
Gary Lin |
7dd6b6 |
@@ -243,7 +243,7 @@ define do_install
|
|
Gary Lin |
7dd6b6 |
if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
|
|
Gary Lin |
7dd6b6 |
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
|
|
Gary Lin |
7dd6b6 |
fi; \
|
|
Gary Lin |
7dd6b6 |
- $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
|
|
Gary Lin |
7dd6b6 |
+ $(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2'
|
|
Gary Lin |
7dd6b6 |
endef
|
|
Gary Lin |
7dd6b6 |
|
|
Gary Lin |
7dd6b6 |
install_lib: all_cmd
|