Messages in this thread Patch in this message | | | From | Norbert Manthey <> | Subject | [less-CONFIG_NET 3/7] seccomp: include net and bpf files | Date | Wed, 6 Jun 2018 15:53:22 +0200 |
| |
When we want to use CONFIG_SECCOMP_FILTER without CONFIG_NET, we have to ensure that the required files that would be pulled in via CONFIG_NET are compiled when dropping CONFIG_NET.
Signed-off-by: Norbert Manthey <nmanthey@amazon.de> --- kernel/bpf/Makefile | 3 ++- net/Makefile | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile index a713fd2..5d13269 100644 --- a/kernel/bpf/Makefile +++ b/kernel/bpf/Makefile @@ -4,7 +4,8 @@ obj-y := core.o obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o obj-$(CONFIG_BPF_SYSCALL) += disasm.o -ifeq ($(CONFIG_NET),y) + +ifneq ($(filter y,$(CONFIG_NET) $(CONFIG_SECCOMP_FILTER)),) obj-$(CONFIG_BPF_SYSCALL) += devmap.o obj-$(CONFIG_BPF_SYSCALL) += cpumap.o obj-$(CONFIG_BPF_SYSCALL) += offload.o diff --git a/net/Makefile b/net/Makefile index a6147c6..08f1875 100644 --- a/net/Makefile +++ b/net/Makefile @@ -11,6 +11,11 @@ obj-$(CONFIG_NET) := socket.o core/ tmp-$(CONFIG_COMPAT) := compat.o obj-$(CONFIG_NET) += $(tmp-y) +ifneq ($(CONFIG_NET),y) +obj-$(CONFIG_SECCOMP_FILTER) += core/filter.o +obj-$(CONFIG_SECCOMP_FILTER) += core/flow_dissector.o +endif + # LLC has to be linked before the files in net/802/ obj-$(CONFIG_LLC) += llc/ obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ bpf/ -- 2.7.4 Amazon Development Center Germany GmbH Berlin - Dresden - Aachen main office: Krausenstr. 38, 10117 Berlin Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger Ust-ID: DE289237879 Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
| |