modutils: fix config options dependency

module.aliases and module.symbols files have no use in modprobe-small
implementation. So FEATURE_MODUTILS_ALIAS and FEATURE_MODUTILS_SYMBOLS
will depend on !MODPROBE_SMALL.

The try_to_mmap_module() function is not called in modprobe-small.c,
so I will let FEATURE_INSMOD_TRY_MMAP depend on !MODPROBE_SMALL for
now.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Likewise, FEATURE_2_4_MODULES is not used by modprobe-small.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig
index b7d9a35c2550d020616e309a85d3c6d403342ff2..7fbbbecc7df007439a8f36111a0142f9d3f2b7ae 100644 (file)
--- a/configs/TEST_nommu_defconfig
+++ b/configs/TEST_nommu_defconfig
@@ -452,15 +452,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_INSMOD_TRY_MMAP=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig
index 99deb67fe9ad910bb26c234053f9b83a12f2f866..34d8e31e2c8f8a68a8c4f9e79ff8c16c8c65ad21 100644 (file)
--- a/configs/TEST_rh9_defconfig
+++ b/configs/TEST_rh9_defconfig
@@ -467,15 +467,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index b079fa7595ece95dba5797215eab520d4d621db7..20866c32b7efe685bf59464909fd5b5d284d52d1 100644 (file)
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -487,15 +487,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index 4273d33821fa9ba75a41ffb76c1350889f3fb020..bdca9eebb79db50d5c956c4a27b198f41c457693 100644 (file)
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -597,15 +597,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/configs/android_defconfig b/configs/android_defconfig
index b9489c45697a996ffb3bf96e61cc7c23579351ef..6ef81750e6a12f72bbcc344b7b1045a4d40ca26b 100644 (file)
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -511,15 +511,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index caf22e57b904f8274dcfd46f3dce39efd320f30f..35d03b42ec0e451be95dd2cd6b7827574b4c98ff 100644 (file)
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -522,15 +522,12 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
 CONFIG_DEFAULT_MODULES_DIR="/system/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

diff --git a/modutils/Config.src b/modutils/Config.src
index 1808f332d835deb33c9848fae51d39279bdd0d01..1aee57ee7e3b6af56048bc88ccb99a5d395687af 100644 (file)
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -43,7 +43,7 @@ comment "Options common to multiple modutils"
 config FEATURE_2_4_MODULES
        bool "Support version 2.2/2.4 Linux kernels"
        default n
-       depends on INSMOD || RMMOD || LSMOD
+       depends on (INSMOD || RMMOD || LSMOD) && !MODPROBE_SMALL
        select PLATFORM_LINUX
        help
          Support module loading for 2.2.x and 2.4.x Linux kernels.
@@ -53,7 +53,7 @@ config FEATURE_2_4_MODULES
 config FEATURE_INSMOD_TRY_MMAP
        bool "Try to load module from a mmap'ed area"
        default n
-       depends on INSMOD || MODPROBE_SMALL
+       depends on INSMOD && !MODPROBE_SMALL
        select PLATFORM_LINUX
        help
          This option causes module loading code to try to mmap
@@ -135,7 +135,7 @@ config FEATURE_CHECK_TAINTED_MODULE
 config FEATURE_MODUTILS_ALIAS
        bool "Support module.aliases file"
        default y
-       depends on DEPMOD || MODPROBE
+       depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL
        select PLATFORM_LINUX
        help
          Generate and parse modules.alias containing aliases for bus
@@ -152,7 +152,7 @@ config FEATURE_MODUTILS_ALIAS
 config FEATURE_MODUTILS_SYMBOLS
        bool "Support module.symbols file"
        default y
-       depends on DEPMOD || MODPROBE
+       depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL
        select PLATFORM_LINUX
        help
          Generate and parse modules.symbols containing aliases for