From 13ec8222a8549fb59c73c4abf7a53e7c40d06cc0 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 9 Jan 2011 22:43:06 +0000 Subject: [PATCH] kernel: deactivate ext4 SElinux support and extended attributes support in general config. This effects the build in kmod-fs-ext4 and when it is build into the kernel in the x86 target. Thank you Philip Prindeville git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24951 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 4 ---- target/linux/generic/config-2.6.30 | 2 ++ target/linux/generic/config-2.6.31 | 3 +++ target/linux/generic/config-2.6.32 | 1 + target/linux/generic/config-2.6.34 | 2 ++ target/linux/generic/config-2.6.35 | 1 + target/linux/generic/config-2.6.36 | 1 + target/linux/generic/config-2.6.37 | 1 + 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index e5714aab64..846bc8233f 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -112,10 +112,6 @@ define KernelPackage/fs-ext4 SUBMENU:=$(FS_MENU) TITLE:=EXT4 filesystem support KCONFIG:= \ - CONFIG_EXT4DEV_COMPAT=n \ - CONFIG_EXT4_FS_XATTR=y \ - CONFIG_EXT4_FS_POSIX_ACL=y \ - CONFIG_EXT4_FS_SECURITY=y \ CONFIG_EXT4_FS \ CONFIG_JBD2 DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30 index 6e7d6a7965..87e8c6dded 100644 --- a/target/linux/generic/config-2.6.30 +++ b/target/linux/generic/config-2.6.30 @@ -521,6 +521,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT4DEV_COMPAT is not set # CONFIG_EXT4DEV_FS is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_FS_XATTR is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_EXTRA_TARGETS="" # CONFIG_FAIR_GROUP_SCHED is not set diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31 index e664748f53..96f955eeee 100644 --- a/target/linux/generic/config-2.6.31 +++ b/target/linux/generic/config-2.6.31 @@ -502,8 +502,11 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_COMPAT is not set # CONFIG_EXT4DEV_FS is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_FS_XATTR is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_EXTRA_TARGETS="" # CONFIG_EZX_PCAP is not set diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32 index 2e7756c532..5e3733ae64 100644 --- a/target/linux/generic/config-2.6.32 +++ b/target/linux/generic/config-2.6.32 @@ -552,6 +552,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT4DEV_FS is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_FS_XATTR is not set CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXTRA_FIRMWARE="" diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34 index 7f176181a4..9209458ee2 100644 --- a/target/linux/generic/config-2.6.34 +++ b/target/linux/generic/config-2.6.34 @@ -569,6 +569,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT4DEV_FS is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_FS_XATTR is not set CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXTRA_FIRMWARE="" CONFIG_EXTRA_TARGETS="" diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35 index 8e1b16de74..8f64f3414b 100644 --- a/target/linux/generic/config-2.6.35 +++ b/target/linux/generic/config-2.6.35 @@ -594,6 +594,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT4DEV_FS is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_FS_XATTR is not set CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXTRA_FIRMWARE="" diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36 index 0bc1175f4e..45dbde073c 100644 --- a/target/linux/generic/config-2.6.36 +++ b/target/linux/generic/config-2.6.36 @@ -565,6 +565,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_FS_XATTR is not set CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXTRA_FIRMWARE="" diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37 index 7e7685ae02..b8fa6009eb 100644 --- a/target/linux/generic/config-2.6.37 +++ b/target/linux/generic/config-2.6.37 @@ -564,6 +564,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_FS is not set +# CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_FS_XATTR is not set CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXTRA_FIRMWARE="" -- 2.11.0