| Message ID | 20180619151620.1912-1-mcroce@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | bpfilter: fix build error | expand |
From: Matteo Croce <mcroce@redhat.com> Date: Tue, 19 Jun 2018 17:16:20 +0200 > 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> Applied.
On Tue, 19 Jun 2018 17:16:20 +0200 Matteo Croce <mcroce@redhat.com> wrote: > 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> > --- > net/bpfilter/Makefile | 6 ++++-- > 1 file 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 \ Why do you use objdump instead of $(OBJDUMP) now? I guess this might cause issues if you're cross-compiling.
On Wed, Jun 20, 2018 at 12:39 PM Stefano Brivio <sbrivio@redhat.com> wrote: > > On Tue, 19 Jun 2018 17:16:20 +0200 > Matteo Croce <mcroce@redhat.com> wrote: > > > 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> > > --- > > net/bpfilter/Makefile | 6 ++++-- > > 1 file 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 \ > > Why do you use objdump instead of $(OBJDUMP) now? I guess this might > cause issues if you're cross-compiling. > > -- > Stefano Right, I've sent a proper fix. Thanks,
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
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> --- net/bpfilter/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)