From afab47e4509f2da4c7fae6d5e1e8c5950b53a150 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 12 Jan 2012 23:18:25 +0100
Subject: [PATCH] kmod: update to kmod-3, replace busybox's modutils

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/busybox/config/busybox.conf | 28 +++++++++----------
 packages/sysutils/kmod/build                  |  1 +
 packages/sysutils/kmod/install                | 10 ++++++-
 packages/sysutils/kmod/meta                   |  6 ++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index cac3ead290..d12fa78e2d 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.19.3
-# Wed Jan 11 18:41:13 2012
+# Thu Jan 12 22:58:59 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -482,33 +482,33 @@ CONFIG_FEATURE_SU_CHECKS_SHELLS=y
 #
 # Linux Module Utilities
 #
-CONFIG_MODINFO=y
+# CONFIG_MODINFO is not set
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_BLACKLIST=y
-CONFIG_DEPMOD=y
+# CONFIG_INSMOD is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
 
 #
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_INSMOD_TRY_MMAP=y
+# 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=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/kmod/build b/packages/sysutils/kmod/build
index ab6dddf1ae..2e94e9acc7 100755
--- a/packages/sysutils/kmod/build
+++ b/packages/sysutils/kmod/build
@@ -30,3 +30,4 @@ cd $PKG_BUILD
             --disable-static \
 
 make
+$MAKEINSTALL
\ No newline at end of file
diff --git a/packages/sysutils/kmod/install b/packages/sysutils/kmod/install
index 9ea31b27ce..afe03af5f7 100755
--- a/packages/sysutils/kmod/install
+++ b/packages/sysutils/kmod/install
@@ -26,4 +26,12 @@ mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libkmod/.libs/*.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/tools/.libs/* $INSTALL/usr/bin
+  cp -P $PKG_BUILD/tools/.libs/kmod $INSTALL/usr/bin
+
+mkdir -p $INSTALL/sbin
+  ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod
+  ln -sf /usr/bin/kmod $INSTALL/sbin/insmod
+  ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod
+  ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo
+  ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe
+
diff --git a/packages/sysutils/kmod/meta b/packages/sysutils/kmod/meta
index 6dc7ebc8a1..2bade809b9 100644
--- a/packages/sysutils/kmod/meta
+++ b/packages/sysutils/kmod/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="kmod"
-PKG_VERSION="1"
-PKG_REV="1"
+PKG_VERSION="3"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
-PKG_URL="http://packages.profusion.mobi/kmod//$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://packages.profusion.mobi/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"