config: clean double whitespace in Config-build.in

[openwrt/staging/jow.git] / config / Config-build.in

diff --git a/config/Config-build.in b/config/Config-build.in
index fc94f4d45e0c4cd309555a8231cf93ec9277f2e2..bae1552096af1f1aae15a15b78cb83c86a2ad00b 100644 (file)
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -282,11 +282,11 @@ menu "Global build settings"
                        bool "Strong"
        endchoice
 
-       config  KERNEL_STACKPROTECTOR
+       config KERNEL_STACKPROTECTOR
                bool
                default KERNEL_CC_STACKPROTECTOR_REGULAR || KERNEL_CC_STACKPROTECTOR_STRONG
 
-       config  KERNEL_STACKPROTECTOR_STRONG
+       config KERNEL_STACKPROTECTOR_STRONG
                bool
                default KERNEL_CC_STACKPROTECTOR_STRONG
 
@@ -329,13 +329,45 @@ menu "Global build settings"
        endchoice
 
        config TARGET_ROOTFS_SECURITY_LABELS
-               bool "Enable rootfs security labels"
+               bool
                select KERNEL_SQUASHFS_XATTR
                select KERNEL_EXT4_FS_SECURITY
                select KERNEL_F2FS_FS_SECURITY
                select KERNEL_UBIFS_FS_SECURITY
                select KERNEL_JFFS2_FS_SECURITY
-               select PACKAGE_refpolicy
+
+       config SELINUX
+               bool "Enable SELinux"
+               select KERNEL_SECURITY_SELINUX
+               select TARGET_ROOTFS_SECURITY_LABELS
+               select PACKAGE_procd-selinux
+               select PACKAGE_busybox-selinux
                help
-                 This option enables the usage of SELinux labels
+                 This option enables SELinux kernel features, applies security labels
+                 in squashfs rootfs and selects the selinux-variants of busybox and procd.
+
+                 Selecting this option results in about 0.5MiB of additional flash space
+                 usage accounting for increased kernel and rootfs size.
+
+       choice
+               prompt "default SELinux type"
+               depends on TARGET_ROOTFS_SECURITY_LABELS
+               default SELINUXTYPE_dssp
+               help
+                 Select SELinux policy to be installed and used for applying rootfs labels.
+
+               config SELINUXTYPE_targeted
+                       bool "targeted"
+                       select PACKAGE_refpolicy
+                       help
+                         SELinux Reference Policy (refpolicy)
+
+               config SELINUXTYPE_dssp
+                       bool "dssp"
+                       select PACKAGE_selinux-policy
+                       help
+                         Defensec SELinux Security Policy -- OpenWrt edition
+
+       endchoice
+
 endmenu