From 382ebf96914d2b1a244a7b8cf4c4d9a1d1dff761 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 30 Nov 2006 03:23:09 +0000
Subject: ixp4xx-kernel, slugos: moved some modules into the kernel (those that
are the lowest common denominator of the target devices)
---
packages/images/slugos-image.bb | 3 +--
packages/linux/ixp4xx-kernel_2.6.19.bb | 2 +-
packages/slugos-init/files/modulefunctions | 10 ----------
packages/slugos-init/slugos-init_0.10.bb | 2 +-
4 files changed, 3 insertions(+), 14 deletions(-)
(limited to 'packages')
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 388a97583f..714945ffc6 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -69,11 +69,10 @@ 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 ?= "kernel-module-netconsole"
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..999e09fbcd 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 = "596"
#
# 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 \
--
cgit v1.2.3
From 13e26e77ab0cbf49caed11c1f0ce6eb6faa3e0a3 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 10:27:20 +0000
Subject: slugos-image: Added netconsole into the kernel
---
packages/images/slugos-image.bb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'packages')
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 714945ffc6..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,10 +69,9 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
# known to be sufficient for boot.)
SLUGOS_SUPPORT ?= "diffutils cpio findutils udev"
-# 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-netconsole"
+SLUGOS_KERNEL ?= ""
+
+SLUGOS_EXTRA_RDEPENDS ?= ""
RDEPENDS = "kernel ixp4xx-npe \
base-files base-passwd netbase \
--
cgit v1.2.3
From 22cb8e22f0f2e21a5929ebead0a46a8de9459958 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 10:27:56 +0000
Subject: ixp4xx-kernel: updated the latest SVN to include RTC probe kernel
patches
---
packages/linux/ixp4xx-kernel_2.6.19.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'packages')
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 999e09fbcd..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 = "596"
+IXP4XX_KERNEL_SVN_REV = "604"
#
# The directory containing the patches to be applied is
# specified below
--
cgit v1.2.3