aboutsummaryrefslogtreecommitdiffstats
path: root/kernels
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2020-09-14 23:02:41 -0700
committerNathan Chancellor <natechancellor@gmail.com>2020-09-14 23:02:41 -0700
commitdce176b8a77ce7585b66391d32d4c4a2da73f3f6 (patch)
treee083460ab59c4d01b40abb24ffd8106acbdf487d /kernels
parentAugust update (diff)
downloadandroid-wireguard-module-builder-dce176b8a77ce7585b66391d32d4c4a2da73f3f6.tar.xz
android-wireguard-module-builder-dce176b8a77ce7585b66391d32d4c4a2da73f3f6.zip
September update
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Diffstat (limited to 'kernels')
-rw-r--r--kernels/bonito/manifest.xml4
-rw-r--r--kernels/bonito/version-hashes.txt2
-rw-r--r--kernels/coral/manifest.xml4
-rw-r--r--kernels/coral/version-hashes.txt2
-rw-r--r--kernels/crosshatch/manifest.xml4
-rw-r--r--kernels/crosshatch/version-hashes.txt2
-rw-r--r--kernels/wahoo/0001-BACKPORT-arm64-makefile-fix-build-of-.i-file-in-exte.patch56
-rw-r--r--kernels/wahoo/do.bash2
-rw-r--r--kernels/wahoo/manifest.xml4
-rw-r--r--kernels/wahoo/version-hashes.txt2
10 files changed, 12 insertions, 70 deletions
diff --git a/kernels/bonito/manifest.xml b/kernels/bonito/manifest.xml
index 6e1d25b..b5e8172 100644
--- a/kernels/bonito/manifest.xml
+++ b/kernels/bonito/manifest.xml
@@ -1,6 +1,6 @@
<manifest>
<remote name="aosp" fetch="https://android.googlesource.com/" />
- <default revision="refs/tags/android-10.0.0_r0.79" remote="aosp" sync-j="4" />
+ <default revision="refs/tags/android-11.0.0_r0.3" remote="aosp" sync-j="4" />
<project path="build" name="kernel/build" revision="master" clone-depth="1" />
@@ -14,6 +14,6 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="pie-release" clone-depth="1" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="pie-release" clone-depth="1" />
- <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android10-dev" clone-depth="1" groups="partner" />
+ <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android11-release" clone-depth="1" groups="partner" />
<project path="prebuilts-master/misc" name="platform/prebuilts/misc" revision="pie-release" clone-depth="1" />
</manifest>
diff --git a/kernels/bonito/version-hashes.txt b/kernels/bonito/version-hashes.txt
index 63757dc..0158482 100644
--- a/kernels/bonito/version-hashes.txt
+++ b/kernels/bonito/version-hashes.txt
@@ -1 +1 @@
-cd382a968289fcf41bd73b0a1ccaddfaa9920d8e1830a156b2a5b8694af42997|Linux version 4.9.210-gdee0d123b122-ab6570413 (android-build@abfarm-east4-032) (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)) #0 SMP PREEMPT Tue Jun 9 02:07:02 UTC 2020
+ab8b0738c7a446abdd0146c325daee61a11928d18e7a2d1b4eb05ff6ca8f164c|Linux version 4.9.223-g5bded8e40b62-ab6647920 (android-build@abfarm-us-west1-c-0089) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu Jul 2 03:21:55 UTC 2020
diff --git a/kernels/coral/manifest.xml b/kernels/coral/manifest.xml
index 9cba71b..46af155 100644
--- a/kernels/coral/manifest.xml
+++ b/kernels/coral/manifest.xml
@@ -1,6 +1,6 @@
<manifest>
<remote name="aosp" fetch="https://android.googlesource.com/" />
- <default revision="refs/tags/android-10.0.0_r0.81" remote="aosp" sync-j="4" />
+ <default revision="refs/tags/android-11.0.0_r0.4" remote="aosp" sync-j="4" />
<project path="build" name="kernel/build" revision="master" clone-depth="1" />
@@ -16,6 +16,6 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="pie-release" clone-depth="1" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="pie-release" clone-depth="1" />
- <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android10-dev" clone-depth="1" groups="partner" />
+ <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android11-release" clone-depth="1" groups="partner" />
<project path="prebuilts-master/misc" name="platform/prebuilts/misc" revision="pie-release" clone-depth="1" />
</manifest>
diff --git a/kernels/coral/version-hashes.txt b/kernels/coral/version-hashes.txt
index 8d05d72..5c74ae1 100644
--- a/kernels/coral/version-hashes.txt
+++ b/kernels/coral/version-hashes.txt
@@ -1 +1 @@
-2d180ee5cc3e5f626ba8bce2037b8e241d238c2664e098282e97143bacbd9e07|Linux version 4.14.170-g5513138224ab-ab6570431 (android-build@abfarm-east4-052) (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:18:01 UTC 2020
+d497d7565ff41260eabe0e423123eaa68d60e5cd47e60eb057351c8abc2df8e8|Linux version 4.14.180-g051355490483-ab6669324 (android-build@abfarm-01118) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Fri Jul 10 09:40:47 UTC 2020
diff --git a/kernels/crosshatch/manifest.xml b/kernels/crosshatch/manifest.xml
index be5db69..fb2fab4 100644
--- a/kernels/crosshatch/manifest.xml
+++ b/kernels/crosshatch/manifest.xml
@@ -1,6 +1,6 @@
<manifest>
<remote name="aosp" fetch="https://android.googlesource.com/" />
- <default revision="refs/tags/android-10.0.0_r0.77" remote="aosp" sync-j="4" />
+ <default revision="refs/tags/android-11.0.0_r0.2" remote="aosp" sync-j="4" />
<project path="build" name="kernel/build" revision="master" clone-depth="1" />
@@ -14,6 +14,6 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="pie-release" clone-depth="1" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="pie-release" clone-depth="1" />
- <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android10-dev" clone-depth="1" groups="partner" />
+ <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android11-release" clone-depth="1" groups="partner" />
<project path="prebuilts-master/misc" name="platform/prebuilts/misc" revision="pie-release" clone-depth="1" />
</manifest>
diff --git a/kernels/crosshatch/version-hashes.txt b/kernels/crosshatch/version-hashes.txt
index 53fc893..719d281 100644
--- a/kernels/crosshatch/version-hashes.txt
+++ b/kernels/crosshatch/version-hashes.txt
@@ -1 +1 @@
-04bb7e117df5e4fdf38a1f80681f6d8dcec7081fb9f3dc4864285a16b477da03|Linux version 4.9.210-gdee0d123b122-ab6570413 (android-build@abfarm-east4-083) (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)) #0 SMP PREEMPT Tue Jun 9 02:10:51 UTC 2020
+e3ab02b57886d39a7503f6554a16542c9e3c00605c91a98056ad8bad611d1565|Linux version 4.9.223-g5bded8e40b62-ab6647920 (android-build@abfarm-us-west1-c-0040) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu Jul 2 03:22:48 UTC 2020
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 <kamensky@cisco.com>
-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 <kevin.brodsky@arm.com>
-Signed-off-by: Victor Kamensky <kamensky@cisco.com>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
----
- 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 @@
<manifest>
<remote name="aosp" fetch="https://android.googlesource.com/" />
- <default revision="refs/tags/android-10.0.0_r0.75" remote="aosp" sync-j="4" />
+ <default revision="refs/tags/android-11.0.0_r0.1" remote="aosp" sync-j="4" />
<project path="build" name="kernel/build" revision="master" clone-depth="1" />
@@ -10,6 +10,6 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="pie-release" clone-depth="1" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="pie-release" clone-depth="1" />
- <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android10-dev" clone-depth="1" groups="partner" />
+ <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="android11-release" clone-depth="1" groups="partner" />
<project path="prebuilts-master/misc" name="platform/prebuilts/misc" revision="pie-release" clone-depth="1" />
</manifest>
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