Gary Lin 993b08
From: Jesper Dangaard Brouer <brouer@redhat.com>
Gary Lin 993b08
Date: Wed, 17 Jan 2018 00:20:40 +0100
Gary Lin 993b08
Subject: libbpf: Makefile set specified permission mode
Gary Lin 993b08
Patch-mainline: v4.16-rc1
Gary Lin 993b08
Git-commit: 7110d80d53f472956420cd05a6297f49b558b674
Gary Lin 993b08
References: bsc#1083647
Gary Lin 993b08
Gary Lin 993b08
The third parameter to do_install was not used by $(INSTALL) command.
Gary Lin 993b08
Fix this by only setting the -m option when the third parameter is supplied.
Gary Lin 993b08
Gary Lin 993b08
The use of a third parameter was introduced in commit  eb54e522a000 ("bpf:
Gary Lin 993b08
install libbpf headers on 'make install'").
Gary Lin 993b08
Gary Lin 993b08
Without this change, the header files are install as executables files (755).
Gary Lin 993b08
Gary Lin 993b08
Fixes: eb54e522a000 ("bpf: install libbpf headers on 'make install'")
Gary Lin 993b08
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Gary Lin 993b08
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Gary Lin 993b08
Acked-by: Gary Lin <glin@suse.com>
Gary Lin 993b08
---
Gary Lin 993b08
 tools/lib/bpf/Makefile |    2 +-
Gary Lin 993b08
 1 file changed, 1 insertion(+), 1 deletion(-)
Gary Lin 993b08
Gary Lin 993b08
--- a/tools/lib/bpf/Makefile
Gary Lin 993b08
+++ b/tools/lib/bpf/Makefile
Gary Lin 993b08
@@ -182,7 +182,7 @@ define do_install
Gary Lin 993b08
 	if [ ! -d '$(DESTDIR_SQ)$2' ]; then		\
Gary Lin 993b08
 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2';	\
Gary Lin 993b08
 	fi;						\
Gary Lin 993b08
-	$(INSTALL) $1 '$(DESTDIR_SQ)$2'
Gary Lin 993b08
+	$(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
Gary Lin 993b08
 endef
Gary Lin 993b08
 
Gary Lin 993b08
 install_lib: all_cmd