Skip to content

Commit

Permalink
bpfilter: use 'userprogs' syntax to build bpfilter_umh
Browse files Browse the repository at this point in the history
The user mode helper should be compiled for the same architecture as
the kernel.

This Makefile reused the 'hostprogs' syntax by overriding HOSTCC with CC.
Use the new syntax 'userprogs' to fix the Makefile mess.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Masahiro Yamada committed May 17, 2020
1 parent 7f3a59d commit 8a2cc05
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions net/bpfilter/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
# Makefile for the Linux BPFILTER layer.
#

hostprogs := bpfilter_umh
userprogs := bpfilter_umh
bpfilter_umh-objs := main.o
KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \
$(filter -m32 -m64, $(KBUILD_CFLAGS))
HOSTCC := $(CC)
userccflags += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi

ifeq ($(CONFIG_BPFILTER_UMH), y)
# builtin bpfilter_umh should be compiled with -static
# builtin bpfilter_umh should be linked with -static
# since rootfs isn't mounted at the time of __init
# function is called and do_execv won't find elf interpreter
KBUILD_HOSTLDFLAGS += -static $(filter -m32 -m64, $(KBUILD_CFLAGS))
endif
userldflags += -static

$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh

Expand Down

0 comments on commit 8a2cc05

Please sign in to comment.