[oe-commits] org.oe.dev SlugOS Distro & Image Files: Major changes

[blaster8 commit]

SlugOS Distro & Image Files: Major changes
* Update to kernel version 2.6.18 (new build system)
* Change from udev to mdev to handle /dev and hotplug events (slugos-image.bb)
* Update to include necessary kernel modules post-modularisation (conf/distro/*)

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 96e2ab77ee128f66f43fed40a6c6f1dba8b5b710
ViewMTN: http://monotone.openembedded.org/revision.psp?id=96e2ab77ee128f66f43fed40a6c6f1dba8b5b710
Files:
1
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug.conf
packages/images/slugos-image.bb
Diffs:

#
# mt diff -rea28e4e1c1a0c11e26047fa6671bb28f37c66cfb -r96e2ab77ee128f66f43fed40a6c6f1dba8b5b710
#
# 
# 
# patch "conf/distro/debianslug.conf"
#  from [a84c793f18cbc2a27e2e987cf31897e01201ddbc]
#    to [5806671d11022c15fca22084f1721d9000dce847]
# 
# patch "conf/distro/include/slugos.inc"
#  from [ec997e3ca0150eb9e2be6afb55886823a35ae140]
#    to [f0b04e76971a4ba0667c74bbff9cb44adeb6fe93]
# 
# patch "conf/distro/openslug.conf"
#  from [c48f1ce67df6e28fed4b196f57941800a0c890a8]
#    to [63eaf538622f582e8f4bf4748a8818fb62b1e5af]
# 
# patch "packages/images/slugos-image.bb"
#  from [3231e562bdfb7334d4aa51c49aa5f5591ce49f3a]
#    to [fe797a072f51bb5bb62c8313db223c3067929f5b]
# 
============================================================
--- conf/distro/debianslug.conf	a84c793f18cbc2a27e2e987cf31897e01201ddbc
+++ conf/distro/debianslug.conf	5806671d11022c15fca22084f1721d9000dce847
@@ -87,6 +87,31 @@ kernel-module-nls-utf8 \
 kernel-module-nls-utf8 \
 "
 
+# Add modules required for firmware loading
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-firmware-class \
+"
+
+# Add module to create i2c chardev
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-i2c-dev \
+"
+
+# Add module required for HW RNG support
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ixp4xx-rng \
+"
+
+# 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-usb-storage \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
============================================================
--- conf/distro/include/slugos.inc	ec997e3ca0150eb9e2be6afb55886823a35ae140
+++ conf/distro/include/slugos.inc	f0b04e76971a4ba0667c74bbff9cb44adeb6fe93
@@ -170,14 +170,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18"
 
-# Built-in ethernet modules
-PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
-PREFERRED_VERSION_ixp4xx-csr ?= "2.1"
-PREFERRED_VERSION_ixp-osal ?= "2.1"
-PREFERRED_VERSION_ixp400-eth ?= "1.5"
-
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 SRCDATE_diet-x11 ?= "20060106"
============================================================
--- conf/distro/openslug.conf	c48f1ce67df6e28fed4b196f57941800a0c890a8
+++ conf/distro/openslug.conf	63eaf538622f582e8f4bf4748a8818fb62b1e5af
@@ -87,6 +87,31 @@ kernel-module-nls-utf8 \
 kernel-module-nls-utf8 \
 "
 
+# Add modules required for firmware loading
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-firmware-class \
+"
+
+# Add module to create i2c chardev
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-i2c-dev \
+"
+
+# Add module required for HW RNG support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ixp4xx-rng \
+"
+
+# 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-usb-storage \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
============================================================
--- packages/images/slugos-image.bb	3231e562bdfb7334d4aa51c49aa5f5591ce49f3a
+++ packages/images/slugos-image.bb	fe797a072f51bb5bb62c8313db223c3067929f5b
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 MAINTAINER = "NSLU2 Linux <nslu2-linux at yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r32"
+PR = "r34"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
@@ -65,7 +65,7 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
 # udev is the default way of handling devices, there is no guarantee
 # that the static device table is completely correct (it is just
 # known to be sufficient for boot.)
-SLUGOS_SUPPORT ?= "diffutils cpio findutils udev"
+SLUGOS_SUPPORT ?= "diffutils cpio findutils busybox-mdev"
 
 # kernel-module-af-packet must be in the image for DHCP to work
 # kernel-module-netconsole is here because it is small and is
@@ -73,9 +73,9 @@ SLUGOS_KERNEL ?= "kernel-module-af-packe
 # other than the network to output error messages!)
 SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
        
-RDEPENDS = "kernel ixp-eth \
+RDEPENDS = "kernel \
 	base-files base-passwd netbase \
-        busybox hotplug-ng initscripts-slugos slugos-init \
+        busybox initscripts-slugos slugos-init \
         update-modules sysvinit tinylogin \
 	module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \