From 8389cdba0180b62e76c1316cce815bdcf71c4a33 Mon Sep 17 00:00:00 2001 From: Alexey Min Date: Tue, 14 Dec 2021 17:08:08 +0300 Subject: [PATCH] linux-oneplus-kebab: disable selinux to fix build failures (MR 2737) With selinux enabled, build fails with gcc-11 with multiple errors like this: /home/pmos/build/src/android_kernel_oneplus_sm8250-0c1bed1067131a0bd3e56c1cbdd3473606c5a48a/out/../security/selinux/hooks.c:5553:(.text+0xb34): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.bss.rtic' Selinux is not required for pmOS, so this change should be safe. --- device/testing/linux-oneplus-kebab/APKBUILD | 4 +- .../config-oneplus-kebab.aarch64 | 47 +++---------------- 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/device/testing/linux-oneplus-kebab/APKBUILD b/device/testing/linux-oneplus-kebab/APKBUILD index 6bec9f4a1..5c013e2b2 100644 --- a/device/testing/linux-oneplus-kebab/APKBUILD +++ b/device/testing/linux-oneplus-kebab/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-oneplus-kebab pkgver=4.19.110 -pkgrel=3 +pkgrel=4 pkgdesc="OnePlus 8T kernel fork" arch="aarch64" _carch="arm64" @@ -85,7 +85,7 @@ package() { sha512sums=" 146dc2c324e3985a3347419e624db61aec26e121729c768fbabea56852153cf9d81eb4f070524631e78ea5f8987cd52fd9f356e777f3a557bc91008cab11013c linux-oneplus-kebab-0c1bed1067131a0bd3e56c1cbdd3473606c5a48a.tar.gz -6c8db0f96eb7efe9413af197e80e9151fa06bafc99fa816c4141dec975f562b31423816aeaa1d071ca437f23640078c6af6f9c0c905f2ed628c4655276e48ad8 config-oneplus-kebab.aarch64 +762886bef26e96de73e4a2287d4085006b79ef1dbc930107b8444f49ad0b6a91d6a380c9e002606cfe9b42d26f4244c31904e61ec4e7498d6619ac06481f80cc config-oneplus-kebab.aarch64 27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf linux4.17-gcc10-extern_YYLOC_global_declaration.patch 359f619b7aac5bab061311f0806018ed04ce96a2233584a507b14c50ce616dfbc1681dd465ca3f0182165a6fc6c7b87435615bd1bd93efe174b95deba071f5fc Remove-gcc-python-wrapper.patch 74a98e0719e5f7f0741eb5760c2f8e4bdce7cfc2880d5c203bcaa0140ad8ca5ca1484b543230227406ec197c5da3e7b2c652a21816237473a762a7031c1faf84 Remove-dangerous-flags.patch diff --git a/device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 b/device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 index 6180edb07..88cea4348 100644 --- a/device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 +++ b/device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625 +# Compiler: aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100301 +CONFIG_GCC_VERSION=110201 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -914,7 +914,6 @@ CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_SEG6_LWTUNNEL is not set # CONFIG_IPV6_SEG6_HMAC is not set -CONFIG_NETLABEL=y # CONFIG_ANDROID_PARANOID_NETWORK is not set CONFIG_NETWORK_SECMARK=y CONFIG_NET_PTP_CLASSIFY=y @@ -1099,7 +1098,6 @@ CONFIG_IP_NF_MANGLE=y # CONFIG_IP_NF_TARGET_ECN is not set CONFIG_IP_NF_TARGET_TTL=y CONFIG_IP_NF_RAW=y -CONFIG_IP_NF_SECURITY=y CONFIG_IP_NF_ARPTABLES=y CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y @@ -1130,7 +1128,6 @@ CONFIG_IP6_NF_TARGET_REJECT=y # CONFIG_IP6_NF_TARGET_SYNPROXY is not set CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y -# CONFIG_IP6_NF_SECURITY is not set # CONFIG_IP6_NF_NAT is not set CONFIG_NF_DEFRAG_IPV6=y CONFIG_BRIDGE_NF_EBTABLES=y @@ -5797,12 +5794,8 @@ CONFIG_KEYS_COMPAT=y # CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=32768 +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY_FALLBACK=y @@ -5810,35 +5803,8 @@ CONFIG_HARDENED_USERCOPY_FALLBACK=y CONFIG_FORTIFY_SOURCE=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" -CONFIG_SECURITY_SELINUX=y -# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 -CONFIG_SECURITY_SMACK=y -# CONFIG_SECURITY_SMACK_BRINGUP is not set -# CONFIG_SECURITY_SMACK_NETFILTER is not set -# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set -# CONFIG_SECURITY_TOMOYO is not set -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set -# CONFIG_SECURITY_YAMA is not set -CONFIG_INTEGRITY=y -# CONFIG_INTEGRITY_SIGNATURE is not set -CONFIG_INTEGRITY_AUDIT=y -# CONFIG_IMA is not set -# CONFIG_EVM is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="selinux" +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" # # Kernel hardening options @@ -6169,6 +6135,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y # CONFIG_KASAN is not set CONFIG_KASAN_STACK=1 CONFIG_ARCH_HAS_KCOV=y