diff --git a/packages/linux/build b/packages/linux/build index 31a52a050a..c78ec85b73 100755 --- a/packages/linux/build +++ b/packages/linux/build @@ -46,7 +46,7 @@ rm -rf modules mkdir -p modules make modules -make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/sbin/depmod" modules_install +make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install rm -f modules/lib/modules/*/build rm -f modules/lib/modules/*/source @@ -61,4 +61,4 @@ make $KERNEL_IMAGE V=1 \ DEBUG=false \ NLS=false \ -) \ No newline at end of file +) diff --git a/packages/linux/meta b/packages/linux/meta index 0f456a66f8..31d918ee14 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils" -PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio pciutils" +PKG_BUILD_DEPENDS="toolchain module-init-tools xz cpio pciutils" PKG_PRIORITY="optional" PKG_SECTION="linux" PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules" diff --git a/packages/sysutils/busybox-hosttools/build b/packages/sysutils/busybox-hosttools/build index f14da7312b..0856069a15 100755 --- a/packages/sysutils/busybox-hosttools/build +++ b/packages/sysutils/busybox-hosttools/build @@ -39,5 +39,5 @@ cd $BUILD/busybox* ln -sf busybox $ROOT/$TOOLCHAIN/bin/cryptpw ln -sf busybox $ROOT/$TOOLCHAIN/bin/mkpasswd - mkdir -p $ROOT/$TOOLCHAIN/sbin - ln -sf ../bin/busybox $ROOT/$TOOLCHAIN/sbin/depmod +# mkdir -p $ROOT/$TOOLCHAIN/sbin +# ln -sf ../bin/busybox $ROOT/$TOOLCHAIN/sbin/depmod diff --git a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf index 55ce73edbc..b76cb70008 100644 --- a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf +++ b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.19.0 -# Sun Aug 14 01:31:07 2011 +# Busybox version: 1.19.3 +# Sat Dec 17 01:48:26 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -476,7 +476,7 @@ CONFIG_CRYPTPW=y # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -CONFIG_DEPMOD=y +# CONFIG_DEPMOD is not set # # Options common to multiple modutils @@ -489,10 +489,10 @@ CONFIG_DEPMOD=y # 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=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index c8e62c34ac..7764a3fb69 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="kexec-tools grep hdparm speedcontrol pastebinit" +PKG_DEPENDS="kmod kexec-tools grep hdparm speedcontrol pastebinit" PKG_BUILD_DEPENDS="toolchain busybox-hosttools" PKG_PRIORITY="required" PKG_SECTION="system" diff --git a/scripts/image b/scripts/image index 305d495d83..7d5a05fbbb 100755 --- a/scripts/image +++ b/scripts/image @@ -26,7 +26,7 @@ $SCRIPTS/checkdeps build $SCRIPTS/build toolchain $SCRIPTS/build squashfs $SCRIPTS/build fakeroot -$SCRIPTS/build busybox-hosttools +$SCRIPTS/build module-init-tools export INSTALL=$BUILD/image/system @@ -149,10 +149,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # run depmod KVER=`ls $BUILD/linux-*/modules/lib/modules` - $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $KVER > /dev/null - for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do - rm -f $i - done + $ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL $KVER > /dev/null # strip kernel modules for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do