[oe-commits] org.oe.dev ixp4xx-kernel: Bump SVN to add new ixp_npe driver fixes

[blaster8 commit]

ixp4xx-kernel: Bump SVN to add new ixp_npe driver fixes
slugos-init: adjustments to loadmodules.sh script
mdev: Fake hotplug firmware loading implemented in a script

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e8a49d4eb33d352e09cfea84ecafed2aeeaed231
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e8a49d4eb33d352e09cfea84ecafed2aeeaed231
Files:
1
packages/linux/ixp4xx-kernel_2.6.18.bb
packages/mdev/mdev-1.2.1/slugos/mdev.conf
packages/mdev/mdev_1.2.1.bb
packages/slugos-init/files/initscripts/loadmodules.sh
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -rb7985c9b27e4f7884240af8e51448d4b9983b362 -re8a49d4eb33d352e09cfea84ecafed2aeeaed231
#
# 
# 
# patch "packages/linux/ixp4xx-kernel_2.6.18.bb"
#  from [7654fa39cb0b2191b49d8253001b53ca0657c38b]
#    to [29f755a82cdfba690187d8a2f52124240ce370c8]
# 
# patch "packages/mdev/mdev-1.2.1/slugos/mdev.conf"
#  from [c071e070cbdcd8a1bc4685efc041d2036ce0b54f]
#    to [426ec4e1c8d02371befae354a4ef1b860ce88667]
# 
# patch "packages/mdev/mdev_1.2.1.bb"
#  from [7152a9dac034eea835a1f6f755e6c8dbea40692d]
#    to [74df40f958234a255525656cf4b9471056bdbc02]
# 
# patch "packages/slugos-init/files/initscripts/loadmodules.sh"
#  from [6f621c7c5d135694b4ec8b7ad5e2552296c96b1e]
#    to [bbd583037e80a72899c1e44b5c5d1bcc2078c1fc]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [363deae1f50819d92354f05c2b8aa9bd9a12376b]
#    to [06a0e8ef0a486d9035453066b4a3cfedbe61e079]
# 
============================================================
--- packages/linux/ixp4xx-kernel_2.6.18.bb	7654fa39cb0b2191b49d8253001b53ca0657c38b
+++ packages/linux/ixp4xx-kernel_2.6.18.bb	29f755a82cdfba690187d8a2f52124240ce370c8
@@ -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
============================================================
--- packages/mdev/mdev-1.2.1/slugos/mdev.conf	c071e070cbdcd8a1bc4685efc041d2036ce0b54f
+++ packages/mdev/mdev-1.2.1/slugos/mdev.conf	426ec4e1c8d02371befae354a4ef1b860ce88667
@@ -9,4 +9,4 @@ event0 0:0 660 @ln -sf /dev/event0 /dev/
 tty 0:5 0660
 ttyS* 0:20 640
 event0 0:0 660 @ln -sf /dev/event0 /dev/buzzer
+ixp4xx_ucode root:root 600 @/lib/mdev/loadmicrocode.sh
-ucode_dl root:root 600 @sleep 1 && cat /lib/firmware/NPE-B > /dev/ucode_dl
============================================================
--- packages/mdev/mdev_1.2.1.bb	7152a9dac034eea835a1f6f755e6c8dbea40692d
+++ packages/mdev/mdev_1.2.1.bb	74df40f958234a255525656cf4b9471056bdbc02
@@ -1,24 +1,25 @@ LICENSE = "GPL"
 DESCRIPTION = "mdev is a small busybox utility for maintaining a   \
 dynamic /dev directory and is here packaged separately from        \
 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_install () {
 
 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
 }
============================================================
--- packages/slugos-init/files/initscripts/loadmodules.sh	6f621c7c5d135694b4ec8b7ad5e2552296c96b1e
+++ packages/slugos-init/files/initscripts/loadmodules.sh	bbd583037e80a72899c1e44b5c5d1bcc2078c1fc
@@ -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)
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	363deae1f50819d92354f05c2b8aa9bd9a12376b
+++ packages/slugos-init/slugos-init_0.10.bb	06a0e8ef0a486d9035453066b4a3cfedbe61e079
@@ -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 = "r64"
+PR = "r65"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \