merge of '2ff0b12bedc3fd85cd0cbbce60e7586f5ae352b5'

     and 'a1833fa642a839f32dc4d8e47347b73849b62b48'

6 files changed, 9 insertions, 43 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 0b333e2f01..0bcdac1db5 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # Add modules required for usb support
 DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-usbcore \
 kernel-module-ohci-hcd \
-kernel-module-ehci-hcd \
 kernel-module-uhci-hcd \
-kernel-module-scsi-mod \
-kernel-module-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 55a6942a4f..dec16d8cd7 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # Add modules required for usb support
 OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-usbcore \
 kernel-module-ohci-hcd \
-kernel-module-ehci-hcd \
 kernel-module-uhci-hcd \
-kernel-module-scsi-mod \
-kernel-module-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 388a97583f..82cd6f2b73 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r40"
+PR = "r41"
 
 COMPATIBLE_MACHINE = "nslu2"
 
@@ -53,7 +53,7 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
 
 # CONFIG:
 # SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image
-# SLUGOS_SUPPORT:        set to here, see below, added to the image.
+# SLUGOS_SUPPORT:        set here, see below, added to the image.
 # SLUGOS_KERNEL:         set here, kernel modules added to the image
 #
 # Do not override the last two unless you really know what you
@@ -69,11 +69,9 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
 # known to be sufficient for boot.)
 SLUGOS_SUPPORT ?= "diffutils cpio findutils udev"
 
-# kernel-module-af-packet must be in the image for DHCP to work
-# kernel-module-netconsole is here because it is small and is
-# highly useful on minimal systems (which really don't have anywhere
-# other than the network to output error messages!)
-SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
+SLUGOS_KERNEL ?= ""
+
+SLUGOS_EXTRA_RDEPENDS ?= ""
 
 RDEPENDS = "kernel ixp4xx-npe \
 	base-files base-passwd netbase \
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index d7dbf10618..96de95f487 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "595"
+IXP4XX_KERNEL_SVN_REV = "604"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions
index 1073dae4fb..8ab5e01977 100644
--- a/packages/slugos-init/files/modulefunctions
+++ b/packages/slugos-init/files/modulefunctions
@@ -4,35 +4,25 @@
 . /etc/default/functions
 
 loaddiskmods(){
-	modprobe scsi_mod
-	modprobe sd_mod 
-	modprobe usbcore 
 	case "$(machine)" in
 	    nslu2)                     
-	        modprobe ehci-hcd
 	        modprobe ohci-hcd
 		;;
             nas100d)
                 modprobe pata-artop
-                modprobe ehci-hcd
                 modprobe uhci-hcd
                 ;;
             dsmg600)
                 modprobe pata-artop
-                modprobe ehci-hcd
                 modprobe uhci-hcd
                 ;;
 
 	esac
-	modprobe usb-storage
 }
 
 loadnetmods(){
-	modprobe af_packet
 }
 
 loadmiscmods(){
-	modprobe ixp4xx_rng
-	modprobe i2c_dev
 }
 
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 54c1993c67..d69b32c7ac 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r74"
+PR = "r75"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \