diff options
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.18.bb | 2 | ||||
| -rw-r--r-- | packages/mdev/mdev-1.2.1/slugos/mdev.conf | 2 | ||||
| -rw-r--r-- | packages/mdev/mdev_1.2.1.bb | 12 | ||||
| -rw-r--r-- | packages/slugos-init/files/initscripts/loadmodules.sh | 9 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index 50f3bda3dc..a6d6f2f371 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.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 = "422" +IXP4XX_KERNEL_SVN_REV = "426" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the diff --git a/packages/mdev/mdev-1.2.1/slugos/mdev.conf b/packages/mdev/mdev-1.2.1/slugos/mdev.conf index 26e8606248..eaf77e64d7 100644 --- a/packages/mdev/mdev-1.2.1/slugos/mdev.conf +++ b/packages/mdev/mdev-1.2.1/slugos/mdev.conf @@ -9,4 +9,4 @@ ptmx 0:5 666 tty 0:5 0660 ttyS* 0:20 640 event0 0:0 660 @ln -sf /dev/event0 /dev/buzzer -ucode_dl root:root 600 @sleep 1 && cat /lib/firmware/NPE-B > /dev/ucode_dl +ixp4xx_ucode root:root 600 @/lib/mdev/loadmicrocode.sh
\ No newline at end of file diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb index fd7aac9042..2e424f3644 100644 --- a/packages/mdev/mdev_1.2.1.bb +++ b/packages/mdev/mdev_1.2.1.bb @@ -4,21 +4,22 @@ busybox. This adds a very small extra overhead in rootfs size \ (approx 4kB) but allows greater flexibility." HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" -PR = "r1" +PR = "r3" S = ${WORKDIR}/busybox-${PV} SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://mdevdelnodes.patch;patch=1 \ - file://defconfig \ + file://defconfig \ file://mdev.sh \ file://mdev.conf \ " +SRC_URI_append_slugos = "file://loadmicrocode.sh" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" -FILES_${PN} = "${sysconfdir}/init.d/mdev.sh ${sysconfdir}/mdev.conf ${base_sbindir}/mdev" +FILES_${PN} = "${sysconfdir}/init.d/mdev.sh ${sysconfdir}/mdev.conf ${base_sbindir}/mdev ${base_libdir}/mdev/loadmicrocode.sh" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "mdev.sh" @@ -46,9 +47,14 @@ do_compile () { do_install () { mv ${S}/busybox ${S}/mdev + install -d ${D}${base_sbindir} install -m 0755 ${S}/mdev ${D}${base_sbindir}/ + install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ install -m 0755 ${WORKDIR}/mdev.sh ${D}${sysconfdir}/init.d/ + + install -d ${D}${base_libdir}/mdev + install -m 0755 ${WORKDIR}/loadmicrocode.sh ${D}${base_libdir}/mdev/loadmicrocode.sh } diff --git a/packages/slugos-init/files/initscripts/loadmodules.sh b/packages/slugos-init/files/initscripts/loadmodules.sh index 2ed4156ab0..ced8831aad 100644 --- a/packages/slugos-init/files/initscripts/loadmodules.sh +++ b/packages/slugos-init/files/initscripts/loadmodules.sh @@ -5,13 +5,14 @@ . /etc/default/functions # Load $(machine) function required +echo "Starting Network Processing Engines" +modprobe ixp4xx_npe +sleep 1 # Wait for firmware load + echo "Loading networking modules" modprobe af_packet # Required for DHCP -modprobe ixp4xx_npe -sleep 1 # Allow firmware load to occur - # Add nas100d/loft below when mac definition is added to kernel case "$(machine)" in ixdp425|nslu2) @@ -39,4 +40,4 @@ echo "Loading other modules" modprobe ixp4xx_rng modprobe i2c_dev -exit 0
\ No newline at end of file +exit 0 diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index be5fc61789..11b5462daf 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 = "r64" +PR = "r65" SRC_URI = "file://boot/flash \ file://boot/disk \ |