[oe-commits] org.oe.dev merge of '1e74798b9d0398ad1f222430066b7d2f395d22a1'

[oe commit]

merge of '1e74798b9d0398ad1f222430066b7d2f395d22a1'
     and '593f40ffdb7c1f5127d02f4eb4a64463c9a6ae5e'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 530b964736aebb50649901105fb3215cdecda208
ViewMTN: http://monotone.openembedded.org/revision.psp?id=530b964736aebb50649901105fb3215cdecda208
Files:
1
packages/linux/ixp4xx-kernel_2.6.21.5.bb
packages/tasks/task-slugos.bb
packages/orinoco/spectrum-fw.bb
Diffs:

#
# mt diff -r1e74798b9d0398ad1f222430066b7d2f395d22a1 -r530b964736aebb50649901105fb3215cdecda208
#
# 
# 
# patch "packages/linux/ixp4xx-kernel_2.6.21.5.bb"
#  from [280077a18b031293c1f1b450119bc5c7d1ddf0c8]
#    to [e9a048ca3969704b32d14ddaf7a1b15c1413e95f]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [8c69c0f0db2c1ab6eccbe28cb5703ed893995c13]
#    to [9b3a116faea9265f7fc10285942e53fbc831e391]
# 
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.5.bb	280077a18b031293c1f1b450119bc5c7d1ddf0c8
+++ packages/linux/ixp4xx-kernel_2.6.21.5.bb	e9a048ca3969704b32d14ddaf7a1b15c1413e95f
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "879"
+IXP4XX_KERNEL_SVN_REV = "889"
 #
 # The directory containing the patches to be applied is
 # specified below
============================================================
--- packages/tasks/task-slugos.bb	8c69c0f0db2c1ab6eccbe28cb5703ed893995c13
+++ packages/tasks/task-slugos.bb	9b3a116faea9265f7fc10285942e53fbc831e391
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -100,6 +100,16 @@ madwifi-ng-modules madwifi-ng-tools \
 madwifi-ng-modules madwifi-ng-tools \
 "
 
+## Other wireless tools that should be considered
+## should space be available in the rootfs
+# wireless-tools wpa-supplicant \
+# zd1211-firmware kernel-module-zd1211rw \
+
+# Add kexec tools for rebooting alternate kernels
+SLUGOS_STANDARD_RRECOMMENDS += "\
+kexec-tools \
+"
+
 # Add modules required for Network Console support
 # NOTE: This module is desirable for systems lacking a physical
 # console, but is usually only enabled if specific needs or issues


#
# mt diff -r593f40ffdb7c1f5127d02f4eb4a64463c9a6ae5e -r530b964736aebb50649901105fb3215cdecda208
#
# 
# 
# patch "packages/orinoco/spectrum-fw.bb"
#  from [aa5bcb1b2670dd2c736a9798af5426bcc094a5e0]
#    to [154330d9fc9d18c12a0dd882b43b31e6aecb5f7c]
# 
============================================================
--- packages/orinoco/spectrum-fw.bb	aa5bcb1b2670dd2c736a9798af5426bcc094a5e0
+++ packages/orinoco/spectrum-fw.bb	154330d9fc9d18c12a0dd882b43b31e6aecb5f7c
@@ -1,4 +1,5 @@ DESCRIPTION = "Firmware for Spectrum Wir
 DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
+DEPENDS += " unzip-native "
 LICENSE = "unknown"
 PR = "r1"