diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /net/bpfilter | |
parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
download | linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.bz2 |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
Diffstat (limited to 'net/bpfilter')
-rw-r--r-- | net/bpfilter/.gitignore | 1 | ||||
-rw-r--r-- | net/bpfilter/Makefile | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/bpfilter/.gitignore b/net/bpfilter/.gitignore new file mode 100644 index 000000000000..e97084e3eea2 --- /dev/null +++ b/net/bpfilter/.gitignore @@ -0,0 +1 @@ +bpfilter_umh diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile index e0bbe7583e58..051dc18b8ccb 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 |