From dce176b8a77ce7585b66391d32d4c4a2da73f3f6 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 14 Sep 2020 23:02:41 -0700 Subject: September update Signed-off-by: Nathan Chancellor --- ...m64-makefile-fix-build-of-.i-file-in-exte.patch | 56 ---------------------- kernels/wahoo/do.bash | 2 - kernels/wahoo/manifest.xml | 4 +- kernels/wahoo/version-hashes.txt | 2 +- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 kernels/wahoo/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch (limited to 'kernels/wahoo') diff --git a/kernels/wahoo/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch b/kernels/wahoo/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch deleted file mode 100644 index 2d9dbd8..0000000 --- a/kernels/wahoo/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 43727ef63928891e14c8b02d518d353130092edc Mon Sep 17 00:00:00 2001 -From: Victor Kamensky -Date: Tue, 30 Oct 2018 16:37:10 -0700 -Subject: [PATCH android-msm-wahoo-4.4] BACKPORT: arm64: makefile fix build of - .i file in external module case - -commit 98356eb0ae499c63e78073ccedd9a5fc5c563288 upstream. - -After 'a66649dab350 arm64: fix vdso-offsets.h dependency' if -one will try to build .i file in case of external kernel module, -build fails complaining that prepare0 target is missing. This -issue came up with SystemTap when it tries to build variety -of .i files for its own generated kernel modules trying to -figure given kernel features/capabilities. - -The issue is that prepare0 is defined in top level Makefile -only if KBUILD_EXTMOD is not defined. .i file rule depends -on prepare and in case KBUILD_EXTMOD defined top level Makefile -contains empty rule for prepare. But after mentioned commit -arch/arm64/Makefile would introduce dependency on prepare0 -through its own prepare target. - -Fix it to put proper ifdef KBUILD_EXTMOD around code introduced -by mentioned commit. It matches what top level Makefile does. - -Acked-by: Kevin Brodsky -Signed-off-by: Victor Kamensky -Signed-off-by: Catalin Marinas -Signed-off-by: Nathan Chancellor ---- - arch/arm64/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 186101b7b4a5..3af819e41caa 100644 ---- a/arch/arm64/Makefile -+++ b/arch/arm64/Makefile -@@ -203,6 +203,7 @@ archclean: - CLEAN_FILES += $(boot)/Image $(boot)/Image-dtb $(boot)/Image.* $(boot)/dtbo.img $(boot)/*.dtbc - MRPROPER_FILES += $(boot)/Image $(boot)/Image-dtb $(boot)/Image.* $(boot)/dtbo.img $(boot)/*.dtbc - -+ifeq ($(KBUILD_EXTMOD),) - # We need to generate vdso-offsets.h before compiling certain files in kernel/. - # In order to do that, we should use the archprepare target, but we can't since - # asm-offsets.h is included in some files used to generate vdso-offsets.h, and -@@ -214,6 +215,7 @@ vdso_prepare: prepare0 - $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h - $(if $(CONFIG_VDSO32),$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 \ - include/generated/vdso32-offsets.h) -+endif - - define archhelp - echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' --- -2.27.0.rc2 - diff --git a/kernels/wahoo/do.bash b/kernels/wahoo/do.bash index 4ad8259..b09a829 100644 --- a/kernels/wahoo/do.bash +++ b/kernels/wahoo/do.bash @@ -1,7 +1,5 @@ #!/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 diff --git a/kernels/wahoo/manifest.xml b/kernels/wahoo/manifest.xml index ae58505..6349a12 100644 --- a/kernels/wahoo/manifest.xml +++ b/kernels/wahoo/manifest.xml @@ -1,6 +1,6 @@ - + @@ -10,6 +10,6 @@ - + diff --git a/kernels/wahoo/version-hashes.txt b/kernels/wahoo/version-hashes.txt index 2b5951a..12daae6 100644 --- a/kernels/wahoo/version-hashes.txt +++ b/kernels/wahoo/version-hashes.txt @@ -1 +1 @@ -7721751fbdc297d12668dd0f9293824d2728205e0ecbcc96bd3b5466f16c7279|Linux version 4.4.210-g4fecde07e68d (android-build@abfarm-us-west1-c-0039) (Android (5484270 based on r353983c) clang version 9.0.3 (https://android.googlesource.com/toolchain/clang 745b335211bb9eadfa6aa6301f84715cee4b37c5) (https://android.googlesource.com/toolchain/llvm 60cf23e54e46c807513f7a36d0a7b777920b5881) (based on LLVM 9.0.3svn)) #1 SMP PREEMPT Tue Jun 9 02:03:17 UTC 2020 +b17ec706626664d4b1fef09550378bf5d287c3b6effb55f390e5e19b8c8d6c47|Linux version 4.4.223-g1bc566a21f60-ab6662096 (android-build@abfarm-east4-067) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jul 8 09:51:18 UTC 2020 -- cgit v1.2.3-59-g8ed1b