From 02a1bed0934c5660e4dfa9c5cbcb946fdb69ee1e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 27 Jul 2010 13:56:45 +0200
Subject: [PATCH] module-init-tools: remove package module-init-tools, replace
 'depmod' with busybox's 'depmod' applet

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux/build                              |  4 ++--
 packages/linux/install                            |  4 ++--
 packages/sysutils/module-init-tools/build         | 15 ---------------
 packages/sysutils/module-init-tools/url           |  1 -
 .../x11/driver/xf86-video-nvidia-legacy/install   |  4 ++--
 packages/x11/driver/xf86-video-nvidia/install     |  4 ++--
 6 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100755 packages/sysutils/module-init-tools/build
 delete mode 100644 packages/sysutils/module-init-tools/url

diff --git a/packages/linux/build b/packages/linux/build
index a803f42b57..6eea11d0e6 100755
--- a/packages/linux/build
+++ b/packages/linux/build
@@ -3,7 +3,7 @@
 . config/options $1
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build module-init-tools
+$SCRIPTS/build busybox-hosttools
 
 export INSTALL=$(kernel_path)
 $SCRIPTS/install busybox-initramfs
@@ -15,7 +15,7 @@ rm -rf modules
 mkdir -p modules
 
 make modules
-make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
+make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/sbin/depmod" modules_install
 rm -f modules/lib/modules/*/build
 rm -f modules/lib/modules/*/source
 
diff --git a/packages/linux/install b/packages/linux/install
index 80ab2edb70..e79bce2041 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -2,7 +2,7 @@
 
 . config/options $1
 
-$SCRIPTS/build module-init-tools
+$SCRIPTS/build busybox-hosttools
 $SCRIPTS/install busybox
 
 RAMFS_DRV_SUBSYSTEMS="ata ide scsi"
@@ -13,7 +13,7 @@ mkdir -p $INSTALL/lib/modules/$VER
   cp -r $PKG_BUILD/modules/* $INSTALL
   rm -f $INSTALL/lib/modules/$VER/modules.*
 
-$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL -v $VER > /dev/null
+$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /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
diff --git a/packages/sysutils/module-init-tools/build b/packages/sysutils/module-init-tools/build
deleted file mode 100755
index 6b5cd9570c..0000000000
--- a/packages/sysutils/module-init-tools/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$SCRIPTS/build toolchain
-
-setup_toolchain host
-
-cd $PKG_BUILD
-
-./configure
-
-make depmod
-
-cp build/depmod $ROOT/$TOOLCHAIN/bin
diff --git a/packages/sysutils/module-init-tools/url b/packages/sysutils/module-init-tools/url
deleted file mode 100644
index a5e15d3fd1..0000000000
--- a/packages/sysutils/module-init-tools/url
+++ /dev/null
@@ -1 +0,0 @@
-http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.12.tar.bz2
\ No newline at end of file
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/install b/packages/x11/driver/xf86-video-nvidia-legacy/install
index bd6be4a364..6102aa3efe 100755
--- a/packages/x11/driver/xf86-video-nvidia-legacy/install
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/install
@@ -2,7 +2,7 @@
 
 . config/options $1
 
-$SCRIPTS/build module-init-tools
+$SCRIPTS/build busybox-hosttools
 $SCRIPTS/install linux
 $SCRIPTS/install libXinerama
 
@@ -29,7 +29,7 @@ mkdir -p $INSTALL/lib/modules/$VER/nvidia
     $STRIP --strip-debug $MOD
   done
 
-  $ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL -v $VER > /dev/null
+  $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /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
diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index c9182129b7..d8af9a0d5a 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -2,7 +2,7 @@
 
 . config/options $1
 
-$SCRIPTS/build module-init-tools
+$SCRIPTS/build busybox-hosttools
 $SCRIPTS/install linux
 $SCRIPTS/install libXinerama
 
@@ -31,7 +31,7 @@ mkdir -p $INSTALL/lib/modules/$VER/nvidia
     $STRIP --strip-debug $MOD
   done
 
-  $ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL -v $VER > /dev/null
+  $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /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