merge of '3156c089fb5cb0355b29f37144b9f906f2777e39'

     and 'ef8f7e1827f28b6c7ec038ca0a73fc38766ba61f'

5 files changed, 27 insertions, 27 deletions

diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index c06b4c28fb..efeb0cbbba 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r5"
+PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
@@ -10,14 +10,14 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 
 do_compile() {
-        if test '${ARCH_BYTE_SEX}' = be
-        then
+#        if test '${ARCH_BYTE_SEX}' = be
+#        then
 		${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
-        fi
-        if test '${ARCH_BYTE_SEX}' = le
-        then
-                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
-        fi
+#        fi
+#        if test '${ARCH_BYTE_SEX}' = le
+#        then
+#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#        fi
 }
 
 do_install() {
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 9e13c8766b..babb7e1292 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r5"
+PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
@@ -10,14 +10,14 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 
 do_compile() {
-        if test '${ARCH_BYTE_SEX}' = be
-        then
+#        if test '${ARCH_BYTE_SEX}' = be
+#        then
 		${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
-        fi
-        if test '${ARCH_BYTE_SEX}' = le
-        then
-                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
-        fi
+#        fi
+#        if test '${ARCH_BYTE_SEX}' = le
+#        then
+#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#        fi
 }
 
 do_install() {
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index a5f2ff5b8c..bfa1059825 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 = "435"
+IXP4XX_KERNEL_SVN_REV = "438"
 #
 # 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/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index dca1e422aa..ff55baa04c 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -16,17 +16,17 @@ if test -n "$1"
 then
 	device="$1"
 	shift
-	echo "boot: rootfs: mount $* $device [$UUID]"
-	#
-	# wait if required
+        # proc is needed for UUID mount and module load
+        mount -t proc proc /proc
+        # load USB & SCSI storage modules (/proc required!)
+        echo "boot: loading modules required for disk boot"
+        loaddiskmods
+	# waiting for disk (FIXME)
+	sleep=6
 	test "$sleep" -gt 0 && sleep "$sleep"
 	#
-	# proc is needed for UUID mount
-	mount -t proc proc /proc 
-	#
-	# load USB & SCSI storage modules (/proc required!)
-	echo "boot: loading modules required for boot"
-	loaddiskmods
+	# fire the boot
+	echo "boot: rootfs: mount $* $device [$UUID]"
 	#
 	# Mount read-write because before exec'ing init
 	# If a UUID is given (in the environment) this
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index d6ce0b5f65..efd396e84f 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 = "r69"
+PR = "r71"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \