[oe-commits] org.oe.dev ixp4xx-kernel, slugos: moved some modules into the kernel (those that are the lowest common denominator of the target devices)

[rwhitby commit]

ixp4xx-kernel, slugos: moved some modules into the kernel (those that are the lowest common denominator of the target devices)

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 12edb579fffee6ffcbbed6a66d80c97b7705d000
ViewMTN: http://monotone.openembedded.org/revision.psp?id=12edb579fffee6ffcbbed6a66d80c97b7705d000
Files:
1
conf/distro/debianslug.conf
conf/distro/openslug.conf
packages/images/slugos-image.bb
packages/linux/ixp4xx-kernel_2.6.19.bb
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r0c0a39213297816fe747a929eb567dc73566b81e -r12edb579fffee6ffcbbed6a66d80c97b7705d000
#
# 
# 
# patch "conf/distro/debianslug.conf"
#  from [158de0151482450f0e9c1088330b43dbf3e2003c]
#    to [400b9b09e2683135ca7cb298427512c3f32f8f7d]
# 
# patch "conf/distro/openslug.conf"
#  from [820ff0d032f907f3585a7d3dc32b2a528fa52b26]
#    to [2fb503611e8ad2456231f397cb1fb92060ba8fab]
# 
# patch "packages/images/slugos-image.bb"
#  from [34d9be51d514ffcfe5f2ee355cded7b7eb5a9cfe]
#    to [c8750a0ddc8bd2c60460c98e783ea047edbfdb12]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.19.bb"
#  from [a657d985bbd9485ca9dc29cf8badbf9a531d900f]
#    to [91347662c2d45e24ef31070df6de8fe6c4a22a09]
# 
# patch "packages/slugos-init/files/modulefunctions"
#  from [4e84c37f984852463af7741ae6c83b5910f65d35]
#    to [175137f32f184bc56c68963d322b304f043cf800]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [55382995e38d7d350f6cdf734d685290af6b98eb]
#    to [f360214d31b5f2886cc19687c03e0e1750de3e1b]
# 
============================================================
--- conf/distro/debianslug.conf	158de0151482450f0e9c1088330b43dbf3e2003c
+++ conf/distro/debianslug.conf	400b9b09e2683135ca7cb298427512c3f32f8f7d
@@ -86,26 +86,15 @@ kernel-module-nls-utf8 \
 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
============================================================
--- conf/distro/openslug.conf	820ff0d032f907f3585a7d3dc32b2a528fa52b26
+++ conf/distro/openslug.conf	2fb503611e8ad2456231f397cb1fb92060ba8fab
@@ -86,26 +86,15 @@ kernel-module-nls-utf8 \
 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
============================================================
--- packages/images/slugos-image.bb	34d9be51d514ffcfe5f2ee355cded7b7eb5a9cfe
+++ packages/images/slugos-image.bb	c8750a0ddc8bd2c60460c98e783ea047edbfdb12
@@ -69,11 +69,10 @@ SLUGOS_SUPPORT ?= "diffutils cpio findut
 # 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 ?= "kernel-module-netconsole"
 
 RDEPENDS = "kernel ixp4xx-npe \
 	base-files base-passwd netbase \
============================================================
--- packages/linux/ixp4xx-kernel_2.6.19.bb	a657d985bbd9485ca9dc29cf8badbf9a531d900f
+++ packages/linux/ixp4xx-kernel_2.6.19.bb	91347662c2d45e24ef31070df6de8fe6c4a22a09
@@ -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 = "596"
 #
 # The directory containing the patches to be applied is
 # specified below
============================================================
--- packages/slugos-init/files/modulefunctions	4e84c37f984852463af7741ae6c83b5910f65d35
+++ packages/slugos-init/files/modulefunctions	175137f32f184bc56c68963d322b304f043cf800
@@ -1,38 +1,28 @@ loaddiskmods(){
 #!/bin/sh
 # . this file to load the functions for automatically loading modules
 
 . /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
 }
 
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	55382995e38d7d350f6cdf734d685290af6b98eb
+++ packages/slugos-init/slugos-init_0.10.bb	f360214d31b5f2886cc19687c03e0e1750de3e1b
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r74"
+PR = "r75"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \