[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: Re: [PATCH] Fix modutils config options dependency.
From: Denys Vlasenko <vda.linux () googlemail ! com>
Date: 2017-01-30 18:21:54
Message-ID: CAK1hOcPM-Pqrz+qSuu8mPPW4kcTNTUjZzTD8VeAi4kT8n4nyKA () mail ! gmail ! com
[Download RAW message or body]
Applied, thanks!
On Sun, Jan 29, 2017 at 8:05 AM, Kang-Che Sung <explorer09@gmail.com> wrote:
> 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. I'm not sure whether the lack of try_to_mmap_module in
> modprobe-small is intentional. If not, please reject my changes.
>
> Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
> ---
> configs/TEST_nommu_defconfig | 3 ---
> configs/TEST_rh9_defconfig | 3 ---
> configs/android2_defconfig | 3 ---
> configs/android_502_defconfig | 3 ---
> configs/android_defconfig | 3 ---
> configs/android_ndk_defconfig | 3 ---
> modutils/Config.src | 6 +++---
> 7 files changed, 3 insertions(+), 21 deletions(-)
>
> diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig
> index b7d9a35c2..7fbbbecc7 100644
> --- 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 99deb67fe..34d8e31e2 100644
> --- 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 b079fa759..20866c32b 100644
> --- 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 4273d3382..bdca9eebb 100644
> --- 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 b9489c456..6ef81750e 100644
> --- 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 caf22e57b..35d03b42e 100644
> --- 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 1808f332d..eaf876289 100644
> --- a/modutils/Config.src
> +++ b/modutils/Config.src
> @@ -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
> --
> 2.11.0
>
> _______________________________________________
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic