summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMatteo Croce <mcroce@redhat.com>2018-06-19 18:16:20 +0300
committerDavid S. Miller <davem@davemloft.net>2018-06-20 03:07:46 +0300
commit421780fd498399235b044638e85b352d6da20b6a (patch)
tree5d943801ba060d25b2fb0d8e50416975b1c174dc /net
parent2aee167c3675b088c86f648f834e793a0085e04d (diff)
downloadlinux-421780fd498399235b044638e85b352d6da20b6a.tar.xz
bpfilter: fix build error
bpfilter Makefile assumes that the system locale is en_US, and the parsing of objdump output fails. Set LC_ALL=C and, while at it, rewrite the objdump parsing so it spawns only 2 processes instead of 7. Fixes: d2ba09c17a064 ("net: add skeleton of bpfilter kernel module") Signed-off-by: Matteo Croce <mcroce@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bpfilter/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile
index e0bbe7583e58..dd86b022eff0 100644
--- a/net/bpfilter/Makefile
+++ b/net/bpfilter/Makefile
@@ -21,8 +21,10 @@ endif
# which bpfilter_kern.c passes further into umh blob loader at run-time
quiet_cmd_copy_umh = GEN $@
cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \
- $(OBJCOPY) -I binary -O `$(OBJDUMP) -f $<|grep format|cut -d' ' -f8` \
- -B `$(OBJDUMP) -f $<|grep architecture|cut -d, -f1|cut -d' ' -f2` \
+ $(OBJCOPY) -I binary \
+ `LC_ALL=C objdump -f net/bpfilter/bpfilter_umh \
+ |awk -F' |,' '/file format/{print "-O",$$NF} \
+ /^architecture:/{print "-B",$$2}'` \
--rename-section .data=.init.rodata $< $@
$(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh