コミット: 0be0ce32927b35b9b08fff49047cad71a73b159a - external-busybox (git)

external/busybox

コミットメタ情報

• リビジョン: 0be0ce32927b35b9b08fff49047cad71a73b159a (tree)
• 日時: 2010-01-29 16:07:24
• 作者: Dylan Simon <dylan@dyle...>
• コミッター: Dylan Simon

ログメッセージ

Make modules dir configurable via makefile var

KERNEL_MODULES_DIR defaults to /system/modules/lib/modules but may be assigned in any vendor/product config.
E.g., I have "KERNEL_MODULES_DIR:=/system/lib/modules" in my product makefile.

Note that there's no makefile dependency so it won't pick up changes, but a clean build will work fine.
Accomplished simplistically by removing CONFIG_DEFAULT_MODULES_DIR from the busybox config system.

変更サマリ

• modified: .config
• modified: Android.mk
• modified: include/autoconf.h
• modified: include/bbconfigopts.h
• modified: modutils/Config.in

差分

--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.15.3android
-# Thu Jan 28 17:44:32 2010
+# Fri Jan 29 01:54:08 2010
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -461,7 +461,6 @@ CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
 # 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/modules/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 #

--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+KERNEL_MODULES_DIR?=/system/modules/lib/modules
+
 LOCAL_SRC_FILES := $(shell make -s -C $(LOCAL_PATH) show-sources) \
 	../clearsilver/util/regex/regex.c \
 	libbb/android.c
@@ -14,6 +16,7 @@ LOCAL_CFLAGS := \
 	-Werror=implicit \
 	-DNDEBUG \
 	-include include/autoconf.h \
+	-D'CONFIG_DEFAULT_MODULES_DIR="$(KERNEL_MODULES_DIR)"' \
 	-D'BB_VER="$(strip $(shell make -s -C $(LOCAL_PATH) kernelversion))"' -DBB_BT=AUTOCONF_TIMESTAMP
 
 LOCAL_MODULE := busybox

--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -2,7 +2,7 @@
  * Automatically generated C config: don't edit
  * Busybox version: 1.15.3android
  */
-#define AUTOCONF_TIMESTAMP "2010-01-28 17:44:32 EST"
+#define AUTOCONF_TIMESTAMP "2010-01-29 01:54:08 EST"
 
 #define CONFIG_HAVE_DOT_CONFIG 1
 #define ENABLE_HAVE_DOT_CONFIG 1
@@ -1572,10 +1572,6 @@
 #define ENABLE_FEATURE_MODUTILS_SYMBOLS 0
 #define IF_FEATURE_MODUTILS_SYMBOLS(...)
 #define IF_NOT_FEATURE_MODUTILS_SYMBOLS(...) __VA_ARGS__
-#define CONFIG_DEFAULT_MODULES_DIR "/system/modules/lib/modules"
-#define ENABLE_DEFAULT_MODULES_DIR 1
-#define IF_DEFAULT_MODULES_DIR(...) __VA_ARGS__
-#define IF_NOT_DEFAULT_MODULES_DIR(...)
 #define CONFIG_DEFAULT_DEPMOD_FILE "modules.dep"
 #define ENABLE_DEFAULT_DEPMOD_FILE 1
 #define IF_DEFAULT_DEPMOD_FILE(...) __VA_ARGS__

--- a/include/bbconfigopts.h
+++ b/include/bbconfigopts.h
@@ -380,7 +380,6 @@ static const char *const bbconfig_config =
 "# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set\n"
 "# CONFIG_FEATURE_MODUTILS_ALIAS is not set\n"
 "# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set\n"
-"CONFIG_DEFAULT_MODULES_DIR=\"/system/modules/lib/modules\"\n"
 "CONFIG_DEFAULT_DEPMOD_FILE=\"modules.dep\"\n"
 "# CONFIG_ACPID is not set\n"
 "# CONFIG_FEATURE_ACPID_COMPAT is not set\n"

--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -207,14 +207,6 @@ config FEATURE_MODUTILS_SYMBOLS
 
 	  Say Y if unsure.
 
-config DEFAULT_MODULES_DIR
-	string "Default directory containing modules"
-	default "/lib/modules"
-	depends on DEPMOD || MODPROBE || MODPROBE_SMALL
-	help
-	  Directory that contains kernel modules.
-	  Defaults to "/lib/modules"
-
 config DEFAULT_DEPMOD_FILE
 	string "Default name of modules.dep"
 	default "modules.dep"