diff options
| author | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:39:33 +0000 |
|---|---|---|
| committer | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:39:33 +0000 |
| commit | 485a502c12c532d75c1ebad24cf04c28e0357cc3 (patch) | |
| tree | 260ae3bfd91c5f320a0e4b4f91a392fa21e81235 /conf | |
| parent | c26ac145260f540095b52036dac1bdfb4b5e5c8b (diff) | |
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/*)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/debianslug.conf | 25 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 8 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 25 |
3 files changed, 51 insertions, 7 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index da80210b8f..ed39440661 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -87,6 +87,31 @@ kernel-module-nls-cp437 \ 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. # diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 5e7947f866..3993bf6ec0 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -170,13 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # 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" - -# 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" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 6af761e26e..7c8039b6da 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -87,6 +87,31 @@ kernel-module-nls-cp437 \ 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. # |