Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9104f6d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable SELinux and its dependencies"

parents f45df518 748b40e7

arch/arm/configs/apq8084_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -125,6 +126,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -142,9 +144,11 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -178,6 +182,7 @@ CONFIG_IP_NF_FILTER=y 
CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_MANGLE=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
@@ -387,6 +392,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -421,6 +427,10 @@ CONFIG_DEBUG_LL=y 
CONFIG_EARLY_PRINTK=y

CONFIG_PID_IN_CONTEXTIDR=y

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_ARC4=y

arch/arm/configs/msm8226-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -120,6 +121,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -137,10 +139,12 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -178,6 +182,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=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
@@ -397,6 +402,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -417,6 +423,10 @@ CONFIG_KEYS=y 
CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_XCBC=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_ARC4=y

arch/arm/configs/msm8226_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -121,6 +122,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -138,10 +140,12 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -179,6 +183,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=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
@@ -410,6 +415,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -445,6 +451,10 @@ CONFIG_KEYS=y 
CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_XCBC=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_ARC4=y

arch/arm/configs/msm8610-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CONFIG_LOCALVERSION="-perf" 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -119,6 +120,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -136,9 +138,11 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -176,6 +180,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=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
@@ -361,6 +366,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -379,6 +385,10 @@ CONFIG_DEBUG_USER=y 
CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_KEYS=y

CONFIG_CRYPTO_ECB=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_ARC4=y

arch/arm/configs/msm8610_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -119,6 +120,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -136,9 +138,11 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -176,6 +180,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=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
@@ -368,6 +373,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -399,6 +405,10 @@ CONFIG_DEBUG_USER=y 
CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_KEYS=y

CONFIG_CRYPTO_ECB=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_ARC4=y