diff options
Diffstat (limited to 'kernels/coral')
| -rw-r--r-- | kernels/coral/do.bash | 1 | ||||
| -rw-r--r-- | kernels/coral/manifest.xml | 2 | ||||
| -rw-r--r-- | kernels/coral/selinux.patch | 73 | ||||
| -rw-r--r-- | kernels/coral/version-hashes.txt | 2 |
4 files changed, 2 insertions, 76 deletions
diff --git a/kernels/coral/do.bash b/kernels/coral/do.bash index 5dd7c6e..b5802a0 100644 --- a/kernels/coral/do.bash +++ b/kernels/coral/do.bash @@ -1,7 +1,6 @@ #!/bin/bash set -ex BASE="$(readlink -f "$(dirname "$(readlink -f "$0")")")" -patch -d private/msm-google -p1 < "$BASE/selinux.patch" echo 'EXT_MODULES="${EXT_MODULES} wireguard"' >> private/msm-google/build.config.common echo 'ccflags-y += -Wno-unused-variable' >> wireguard-linux-compat/src/Kbuild ./build/build.sh diff --git a/kernels/coral/manifest.xml b/kernels/coral/manifest.xml index 1c733c9..5d7274a 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.42" remote="aosp" sync-j="4" /> + <default revision="refs/tags/android-10.0.0_r0.49" remote="aosp" sync-j="4" /> <project path="build" name="kernel/build" revision="master" clone-depth="1" /> diff --git a/kernels/coral/selinux.patch b/kernels/coral/selinux.patch deleted file mode 100644 index c40f729..0000000 --- a/kernels/coral/selinux.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 760f8522ce08a24abac3208290f93fe3fffc0d6c Mon Sep 17 00:00:00 2001 -From: Paulo Alcantara <paulo@paulo.ac> -Date: Sun, 24 Feb 2019 21:55:28 -0300 -Subject: selinux: use kernel linux/socket.h for genheaders and mdp - -commit dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e upstream. - -When compiling genheaders and mdp from a newer host kernel, the -following error happens: - - In file included from scripts/selinux/genheaders/genheaders.c:18: - ./security/selinux/include/classmap.h:238:2: error: #error New - address family defined, please update secclass_map. #error New - address family defined, please update secclass_map. ^~~~~ - make[3]: *** [scripts/Makefile.host:107: - scripts/selinux/genheaders/genheaders] Error 1 make[2]: *** - [scripts/Makefile.build:599: scripts/selinux/genheaders] Error 2 - make[1]: *** [scripts/Makefile.build:599: scripts/selinux] Error 2 - make[1]: *** Waiting for unfinished jobs.... - -Instead of relying on the host definition, include linux/socket.h in -classmap.h to have PF_MAX. - -Cc: stable@vger.kernel.org -Signed-off-by: Paulo Alcantara <paulo@paulo.ac> -Acked-by: Stephen Smalley <sds@tycho.nsa.gov> -[PM: manually merge in mdp.c, subject line tweaks] -Signed-off-by: Paul Moore <paul@paul-moore.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - scripts/selinux/genheaders/genheaders.c | 1 - - scripts/selinux/mdp/mdp.c | 1 - - security/selinux/include/classmap.h | 1 + - 3 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c -index fa48fabcb330..3cc4893d98cc 100644 ---- a/scripts/selinux/genheaders/genheaders.c -+++ b/scripts/selinux/genheaders/genheaders.c -@@ -9,7 +9,6 @@ - #include <string.h> - #include <errno.h> - #include <ctype.h> --#include <sys/socket.h> - - struct security_class_mapping { - const char *name; -diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c -index ffe8179f5d41..c29fa4a6228d 100644 ---- a/scripts/selinux/mdp/mdp.c -+++ b/scripts/selinux/mdp/mdp.c -@@ -32,7 +32,6 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> --#include <sys/socket.h> - - static void usage(char *name) - { -diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h -index cc35695d97b4..45ef6a0c17cc 100644 ---- a/security/selinux/include/classmap.h -+++ b/security/selinux/include/classmap.h -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: GPL-2.0 */ - #include <linux/capability.h> -+#include <linux/socket.h> - - #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ - "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" --- -cgit 1.2-0.3.lf.el7 - diff --git a/kernels/coral/version-hashes.txt b/kernels/coral/version-hashes.txt index 49b599d..3e221bd 100644 --- a/kernels/coral/version-hashes.txt +++ b/kernels/coral/version-hashes.txt @@ -1 +1 @@ -2accd4b3d10935f80ac8217befe5b45abbdf736d017aa8a275b94a72dd919023|Linux version 4.14.111-g18553e42fe00-ab6076950 (android-build@abfarm953) (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 Mon Dec 16 21:24:27 UTC 2019 +27a3deae68b59be4621a5a3d38d515d4b82c305bb5cd4bcd6173d70e2383ac88|Linux version 4.14.150-g05fe60fb845b-ab6126650 (android-build@wpre5.hot.corp.google.com) (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 Fri Jan 10 21:13:44 UTC 2020 |