Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 421780fd498399235b044638e85b352d6da20b6a

Authored by Matteo Croce
Committed by David S. Miller
1 parent 2aee167c36

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

net/bpfilter/Makefile
Diff comments   View file @ 421780f
... ... @@ -21,8 +21,10 @@
21 21 # which bpfilter_kern.c passes further into umh blob loader at run-time
22 22 quiet_cmd_copy_umh = GEN $@
23 23 cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \
24   - $(OBJCOPY) -I binary -O `$(OBJDUMP) -f $<|grep format|cut -d' ' -f8` \
25   - -B `$(OBJDUMP) -f $<|grep architecture|cut -d, -f1|cut -d' ' -f2` \
  24 + $(OBJCOPY) -I binary \
  25 + `LC_ALL=C objdump -f net/bpfilter/bpfilter_umh \
  26 + |awk -F' |,' '/file format/{print "-O",$$NF} \
  27 + /^architecture:/{print "-B",$$2}'` \
26 28 --rename-section .data=.init.rodata $< $@
27 29  
28 30 $(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh