From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Pablo Greco <pgreco@centosproject.org>

Date: Fri, 7 Aug 2020 02:59:05 +0000

Subject: [PATCH 2/2] configs 2711

---

 arch/arm/configs/bcm2711_defconfig   | 35 +++++++++++++++++++++++++--

 arch/arm64/configs/bcm2711_defconfig | 36 ++++++++++++++++++++++++++--

 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig

index d31636c..28e0bbd 100644

--- a/arch/arm/configs/bcm2711_defconfig

+++ b/arch/arm/configs/bcm2711_defconfig

@@ -1556,8 +1556,6 @@ CONFIG_NLS_KOI8_R=m

 CONFIG_NLS_KOI8_U=m

 CONFIG_DLM=m

 CONFIG_SECURITY=y

-CONFIG_SECURITY_APPARMOR=y

-CONFIG_LSM=""

 CONFIG_CRYPTO_USER=m

 CONFIG_CRYPTO_CAST5=m

 CONFIG_CRYPTO_DES=y

@@ -1595,3 +1593,38 @@ CONFIG_IRQSOFF_TRACER=y

 CONFIG_SCHED_TRACER=y

 CONFIG_BLK_DEV_IO_TRACE=y

 # CONFIG_UPROBE_EVENTS is not set

+

+# CentOS added

+CONFIG_AUDIT=y

+CONFIG_NETLABEL=y

+CONFIG_NETFILTER_XT_TARGET_AUDIT=m

+CONFIG_IP_NF_SECURITY=m

+CONFIG_IP6_NF_SECURITY=m

+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

+CONFIG_NFSD_V4_SECURITY_LABEL=y

+CONFIG_SECURITY_NETWORK=y

+CONFIG_SECURITY_PATH=y

+CONFIG_SECURITY_SELINUX=y

+CONFIG_SECURITY_SELINUX_BOOTPARAM=y

+CONFIG_SECURITY_SELINUX_DISABLE=y

+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

+CONFIG_NET_TEAM=m

+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

+CONFIG_NET_TEAM_MODE_BROADCAST=m

+CONFIG_NET_TEAM_MODE_LOADBALANCE=m

+CONFIG_NET_TEAM_MODE_RANDOM=m

+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m

+CONFIG_CRYPTO_BLAKE2S=m

+CONFIG_CRYPTO_CURVE25519=m

+CONFIG_CRYPTO_CURVE25519_NEON=m

+CONFIG_CRYPTO_LIB_BLAKE2S=m

+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

+CONFIG_CRYPTO_LIB_CHACHA=m

+CONFIG_CRYPTO_LIB_CURVE25519=m

+CONFIG_CRYPTO_LIB_POLY1305=m

+CONFIG_CRYPTO_POLY1305_ARM=m

+# CONFIG_WIREGUARD_DEBUG is not set

+CONFIG_WIREGUARD=m

+CONFIG_FW_LOADER_COMPRESS=y

+CONFIG_FW_LOADER_COMPRESS_XZ=y

+CONFIG_FW_LOADER_COMPRESS_ZSTD=y

diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig

index 55e6082..b9acdbc 100644

--- a/arch/arm64/configs/bcm2711_defconfig

+++ b/arch/arm64/configs/bcm2711_defconfig

@@ -1573,8 +1573,6 @@ CONFIG_NLS_KOI8_R=m

 CONFIG_NLS_KOI8_U=m

 CONFIG_DLM=m

 CONFIG_SECURITY=y

-CONFIG_SECURITY_APPARMOR=y

-CONFIG_LSM=""

 CONFIG_CRYPTO_USER=m

 CONFIG_CRYPTO_CRYPTD=m

 CONFIG_CRYPTO_AES=m

@@ -1614,3 +1612,39 @@ CONFIG_IRQSOFF_TRACER=y

 CONFIG_SCHED_TRACER=y

 CONFIG_BLK_DEV_IO_TRACE=y

 # CONFIG_UPROBE_EVENTS is not set

+

+# CentOS added

+CONFIG_AUDIT=y

+CONFIG_NETLABEL=y

+CONFIG_NETFILTER_XT_TARGET_AUDIT=m

+CONFIG_IP_NF_SECURITY=m

+CONFIG_IP6_NF_SECURITY=m

+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

+CONFIG_NFSD_V4_SECURITY_LABEL=y

+CONFIG_SECURITY_NETWORK=y

+CONFIG_SECURITY_PATH=y

+CONFIG_SECURITY_SELINUX=y

+CONFIG_SECURITY_SELINUX_BOOTPARAM=y

+CONFIG_SECURITY_SELINUX_DISABLE=y

+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

+CONFIG_NET_TEAM=m

+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

+CONFIG_NET_TEAM_MODE_BROADCAST=m

+CONFIG_NET_TEAM_MODE_LOADBALANCE=m

+CONFIG_NET_TEAM_MODE_RANDOM=m

+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m

+CONFIG_CRYPTO_BLAKE2S=m

+CONFIG_CRYPTO_CURVE25519=m

+CONFIG_CRYPTO_LIB_BLAKE2S=m

+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

+CONFIG_CRYPTO_LIB_CHACHA=m

+CONFIG_CRYPTO_LIB_CURVE25519=m

+CONFIG_CRYPTO_LIB_POLY1305=m

+CONFIG_CRYPTO_POLY1305_NEON=m

+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set

+# CONFIG_WIREGUARD_DEBUG is not set

+CONFIG_WIREGUARD=m

+CONFIG_BLK_DEV_RBD=m

+CONFIG_FW_LOADER_COMPRESS=y

+CONFIG_FW_LOADER_COMPRESS_XZ=y

+CONFIG_FW_LOADER_COMPRESS_ZSTD=y

-- 

2.39.0