From 0b41b2dacfbc784feaf4ee74ef4cf1c85cd264e5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 30 Jul 2012 17:36:55 +0200
Subject: [PATCH] busybox: move modprobe.d files to package 'kmod'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/busybox/install                          | 6 ------
 packages/sysutils/kmod/install                             | 7 +++++++
 .../sysutils/{busybox => kmod}/modprobe.d/aliases.conf     | 0
 .../sysutils/{busybox => kmod}/modprobe.d/blacklist.conf   | 0
 packages/sysutils/{busybox => kmod}/modprobe.d/i2c.conf    | 0
 .../sysutils/{busybox => kmod}/modprobe.d/options.conf     | 0
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename packages/sysutils/{busybox => kmod}/modprobe.d/aliases.conf (100%)
 rename packages/sysutils/{busybox => kmod}/modprobe.d/blacklist.conf (100%)
 rename packages/sysutils/{busybox => kmod}/modprobe.d/i2c.conf (100%)
 rename packages/sysutils/{busybox => kmod}/modprobe.d/options.conf (100%)

diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index 3633f322d4..0af64d227c 100755
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@@ -63,12 +63,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
   # create /etc/hostname
     ln -sf /proc/sys/kernel/hostname $INSTALL/etc/hostname
 
-  mkdir -p $INSTALL/etc/modprobe.d
-    cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
-
-  # add user modprobe.d dir
-    mkdir -p $INSTALL/usr/config/modprobe.d
-
   # add webroot
     mkdir -p $INSTALL/usr/www
       echo "It works" > $INSTALL/usr/www/index.html
diff --git a/packages/sysutils/kmod/install b/packages/sysutils/kmod/install
index e11aceccd3..9c9b7a18dc 100755
--- a/packages/sysutils/kmod/install
+++ b/packages/sysutils/kmod/install
@@ -35,3 +35,10 @@ mkdir -p $INSTALL/sbin
   ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo
   ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe
 
+# add system modprobe.d dir
+  mkdir -p $INSTALL/etc/modprobe.d
+    cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
+
+# add user modprobe.d dir
+  mkdir -p $INSTALL/usr/config/modprobe.d
+
diff --git a/packages/sysutils/busybox/modprobe.d/aliases.conf b/packages/sysutils/kmod/modprobe.d/aliases.conf
similarity index 100%
rename from packages/sysutils/busybox/modprobe.d/aliases.conf
rename to packages/sysutils/kmod/modprobe.d/aliases.conf
diff --git a/packages/sysutils/busybox/modprobe.d/blacklist.conf b/packages/sysutils/kmod/modprobe.d/blacklist.conf
similarity index 100%
rename from packages/sysutils/busybox/modprobe.d/blacklist.conf
rename to packages/sysutils/kmod/modprobe.d/blacklist.conf
diff --git a/packages/sysutils/busybox/modprobe.d/i2c.conf b/packages/sysutils/kmod/modprobe.d/i2c.conf
similarity index 100%
rename from packages/sysutils/busybox/modprobe.d/i2c.conf
rename to packages/sysutils/kmod/modprobe.d/i2c.conf
diff --git a/packages/sysutils/busybox/modprobe.d/options.conf b/packages/sysutils/kmod/modprobe.d/options.conf
similarity index 100%
rename from packages/sysutils/busybox/modprobe.d/options.conf
rename to packages/sysutils/kmod/modprobe.d/options.conf