A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPSTREAM: bpfilter: use 'userprogs' syntax to build bpfilter_umh

Browse source 
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.

Change-Id: I457180fe9e4e3da6e25b5665c47033780e48b40c
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Tashfin Shakeer Rhythm <tashfinshakeerrhythm@gmail.com>
This commit is contained in:
Masahiro Yamada 2020-04-29 12:45:15 +09:00 • committed by basamaryan
commit 7ee4cba542
No known key found for this signature in database
GPG key ID: 210D5384FB2A5885
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
net/bpfilter/Makefile
View file

@ -3,18 +3,14 @@
# Makefile for the Linux BPFILTER layer.
#
hostprogs-y := 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