merge of '31bba0038265d49f89a999578ff89351b559e4a0'

     and 'a6fcc49ed2f48cc2516058b4deccdca676b66dd6'

8 files changed, 24 insertions, 8 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a86e806fe1..5df7fd0656 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -350,6 +350,10 @@ KERNELORG_MIRROR = "http://kernel.org/"
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
 #     into your local.conf
 
+FETCHCMD_svn = "/usr/bin/env svn"
+FETCHCMD_cvs = "/usr/bin/env cvs"
+FETCHCMD_wget = "/usr/bin/env wget -t 5"
+
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
 FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 3a1dec9059..163b63195e 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.6.8"
+BB_MIN_VERSION = "1.8.5"
 INHERIT += "sanity"
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.5.bb b/packages/linux/ixp4xx-kernel_2.6.21.5.bb
index 8ff440b28b..9c8fdc463c 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.5.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.5.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 = "879"
+IXP4XX_KERNEL_SVN_REV = "889"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb
index 015f61593a..f2e11eea74 100644
--- a/packages/orinoco/spectrum-fw.bb
+++ b/packages/orinoco/spectrum-fw.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
+DEPENDS += " unzip-native "
 LICENSE = "unknown"
 PR = "r1"
 
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 3596e9ea1e..138c23a4f4 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 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 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
 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
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri
index 168e5558b6..00a72dc3d5 100644
--- a/packages/webkit/webkit/WebKit.pri
+++ b/packages/webkit/webkit/WebKit.pri
@@ -5,11 +5,11 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
+qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
 gdk-port:CONFIG += link_pkgconfig
 gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
 gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
-gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags)
+gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng
 gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 
 DEFINES += USE_SYSTEM_MALLOC
@@ -22,7 +22,7 @@ qt-port:INCLUDEPATH += \
     $$PWD/WebKitQt/Api
 gdk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/gdk \
-    $$BASE_DIR/WebCore/platform/network/gdk \
+    $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gdk \
     $$BASE_DIR/WebCore/page/gdk
diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro
index eae6a46180..335d11e6e7 100644
--- a/packages/webkit/webkit/WebKit.pro
+++ b/packages/webkit/webkit/WebKit.pro
@@ -1,7 +1,8 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
-SUBDIRS = \
+qt-port:SUBDIRS += WebKitQt/Plugins
+SUBDIRS += \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index 433afb52d2..dd2e8ce6ea 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -41,7 +41,7 @@ do_install() {
 
 	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
 	cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} 
-	cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/
+	cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true
 }