busybox, module-init-tools: use busybox's modprobe and depmod applets instead module-init-tools, move module-init-tools-host to module-init-tools for host 'depmod' needed by 'linux' and other kernel drivers

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-07-08 22:01:49 +02:00
parent c5b981d016
commit 582fca984f
10 changed files with 17 additions and 63 deletions

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.17.0
# Thu Jul 8 17:22:40 2010
# Thu Jul 8 20:37:55 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@ -473,25 +473,25 @@ CONFIG_INSMOD=y
CONFIG_RMMOD=y
CONFIG_LSMOD=y
CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
# CONFIG_MODPROBE is not set
# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
# CONFIG_DEPMOD is not set
CONFIG_MODPROBE=y
CONFIG_FEATURE_MODPROBE_BLACKLIST=y
CONFIG_DEPMOD=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_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=""
CONFIG_DEFAULT_DEPMOD_FILE=""
CONFIG_FEATURE_MODUTILS_ALIAS=y
CONFIG_FEATURE_MODUTILS_SYMBOLS=y
CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
#
# Linux System Utilities

View File

@ -56,6 +56,9 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
mkdir -p $INSTALL/etc/network
cp $PKG_DIR/config/interfaces $INSTALL/etc/network
mkdir -p $INSTALL/etc/modprobe.d
cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
# mkdir -p $INSTALL/usr/config
# cp $PKG_DIR/config/network.conf $INSTALL/usr/config

View File

@ -1,19 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/unpack module-init-tools
setup_toolchain host
cd $BUILD/module-init-tools*
mkdir -p .build-host
cd .build-host
../configure
make depmod
cp depmod $ROOT/$TOOLCHAIN/bin

View File

@ -4,13 +4,12 @@
$SCRIPTS/build toolchain
setup_toolchain host
cd $PKG_BUILD
mkdir -p .build-target
cd .build-target
./configure
../configure --host=$TARGET_NAME \
--build=$HOST_NAME \
make modprobe
make depmod
cp build/depmod $ROOT/$TOOLCHAIN/bin

View File

@ -1,12 +0,0 @@
#!/bin/sh
. config/options
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/sbin
cp $PKG_BUILD/.build-target/modprobe $INSTALL/sbin
cp $PKG_BUILD/.build-target/depmod $INSTALL/sbin
mkdir -p $INSTALL/etc/modprobe.d
cp $PKG_DIR/config/* $INSTALL/etc/modprobe.d

View File

@ -1,17 +0,0 @@
--- module-init-tools-3.8/configure.org 2009-05-24 11:34:42.000000000 +0200
+++ module-init-tools-3.8/configure 2009-05-24 11:34:58.000000000 +0200
@@ -3854,14 +3854,6 @@
# between a broken cc and a working cc but missing libz.a.
LDADD="$LDADD $zlib_flags"
-
-case $target in
-*-*-linux*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: Linux only, dude!" >&5
-$as_echo "$as_me: error: Linux only, dude!" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-
# Thanks to Martin Pool
if test x"$GCC" = xyes
then