From 4e217ddb576884a70fa3cdc08dc96da02dcddb37 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 2 Jun 2020 14:46:50 -0700 Subject: kernels: wahoo: apply a patch to fix the build We need this patch after upstream stable commit 78d19b437554 ("kbuild: fix single target build for external module") was merged via 4.4.210 in the June security update. prepare is now called when building an external module, which calls vdso_prepare, which then calls prepare0, which is only defined when KBUILD_EXTMOD is set. This is not a problem for upstream stable because commit a66649dab350 ("arm64: fix vdso-offsets.h dependency") is not applied there; it is only applied in the Wahoo tree as part of a series of vDSO commits they added. Signed-off-by: Nathan Chancellor --- kernels/wahoo/do.bash | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kernels/wahoo/do.bash') diff --git a/kernels/wahoo/do.bash b/kernels/wahoo/do.bash index b09a829..4ad8259 100644 --- a/kernels/wahoo/do.bash +++ b/kernels/wahoo/do.bash @@ -1,5 +1,7 @@ #!/bin/bash set -ex +BASE="$(readlink -f "$(dirname "$(readlink -f "$0")")")" +patch -d private/msm-google -p1 < "$BASE/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch" echo 'EXT_MODULES="${EXT_MODULES} wireguard"' >> private/msm-google/build.config ./build/build.sh readlink -f out/android-msm-wahoo-4.4/dist/wireguard.ko >&7 -- cgit v1.2.3-59-g8ed1b