diff options
author | Matteo Croce <mcroce@redhat.com> | 2018-06-19 11:16:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-19 20:07:46 -0400 |
commit | 421780fd498399235b044638e85b352d6da20b6a (patch) | |
tree | 5d943801ba060d25b2fb0d8e50416975b1c174dc | |
parent | 2aee167c3675b088c86f648f834e793a0085e04d (diff) |
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>
-rw-r--r-- | net/bpfilter/Makefile | 6 |
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 | |||
21 | # which bpfilter_kern.c passes further into umh blob loader at run-time | 21 | # which bpfilter_kern.c passes further into umh blob loader at run-time |
22 | quiet_cmd_copy_umh = GEN $@ | 22 | quiet_cmd_copy_umh = GEN $@ |
23 | cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \ | 23 | cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \ |
24 | $(OBJCOPY) -I binary -O `$(OBJDUMP) -f $<|grep format|cut -d' ' -f8` \ | 24 | $(OBJCOPY) -I binary \ |
25 | -B `$(OBJDUMP) -f $<|grep architecture|cut -d, -f1|cut -d' ' -f2` \ | 25 | `LC_ALL=C objdump -f net/bpfilter/bpfilter_umh \ |
26 | |awk -F' |,' '/file format/{print "-O",$$NF} \ | ||
27 | /^architecture:/{print "-B",$$2}'` \ | ||
26 | --rename-section .data=.init.rodata $< $@ | 28 | --rename-section .data=.init.rodata $< $@ |
27 | 29 | ||
28 | $(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh | 30 | $(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh |