11 files changed, 46 insertions, 11 deletions

diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 6314e36aa7..bd2dc1652c 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -42,7 +42,7 @@ python () {
         path = bb.data.getVar('PSTAGE_PKGPATH', d, 1)
         path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-')
         bb.data.setVar('PSTAGE_PKGPATH', path, d)
-        scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMDPDIR_STAGE}"
+        scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}"
         bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d)
 
     # PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged 
diff --git a/meta/classes/poky.bbclass b/meta/classes/poky.bbclass
index cf65b6ceb1..7d3c28ffe2 100644
--- a/meta/classes/poky.bbclass
+++ b/meta/classes/poky.bbclass
@@ -7,10 +7,23 @@ osc://.*/.*   http://pokylinux.org/sources/
 p4://.*/.*    http://pokylinux.org/sources/
 svk://.*/.*   http://pokylinux.org/sources/
 svn://.*/.*   http://pokylinux.org/sources/
+
+bzr://.*/.*   http://autobuilder.pokylinux.org/sources/
+cvs://.*/.*   http://autobuilder.pokylinux.org/sources/
+git://.*/.*   http://autobuilder.pokylinux.org/sources/
+hg://.*/.*    http://autobuilder.pokylinux.org/sources/
+osc://.*/.*   http://autobuilder.pokylinux.org/sources/
+p4://.*/.*    http://autobuilder.pokylinux.org/sources/
+svk://.*/.*   http://autobuilder.pokylinux.org/sources/
+svn://.*/.*   http://autobuilder.pokylinux.org/sources/
 }
 
 MIRRORS_append () {
-ftp://.*/.*    http://pokylinux.org/sources/
-http://.*/.*   http://pokylinux.org/sources/
+ftp://.*/.*     http://pokylinux.org/sources/
+http://.*/.*    http://pokylinux.org/sources/
 https://.*/.*   http://pokylinux.org/sources/
+
+ftp://.*/.*      http://autobuilder.pokylinux.org/sources/
+http://.*/.*     http://autobuilder.pokylinux.org/sources/
+https://.*/.*    http://autobuilder.pokylinux.org/sources/
 }
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ddebebb286..e0f33e29c7 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -3,7 +3,7 @@
 
 DISTRO = "poky"
 DISTRO_NAME = "OpenedHand Linux (Poky)"
-DISTRO_VERSION = "3.2+snapshot-${DATE}"
+DISTRO_VERSION = "3.3+snapshot-${DATE}"
 
 MAINTAINER = "OpenedHand <poky@openedhand.com>"
 
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 91abb0792a..6ca8ce8d26 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation
 
 TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc603e"
 
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc
diff --git a/meta/packages/gnome/gnome-keyring_2.26.1.bb b/meta/packages/gnome/gnome-keyring_2.26.1.bb
index cc111c9498..6d1e335291 100644
--- a/meta/packages/gnome/gnome-keyring_2.26.1.bb
+++ b/meta/packages/gnome/gnome-keyring_2.26.1.bb
@@ -5,7 +5,7 @@ PR = "r1"
 
 inherit autotools gnome pkgconfig
 
-DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native"
+DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb
index bd2fdaa0dd..ee669e5ef4 100644
--- a/meta/packages/gypsy/gypsy_0.6.bb
+++ b/meta/packages/gypsy/gypsy_0.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
 
-SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" 
+SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz" 
 
 inherit autotools pkgconfig
 
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index e99fc4a202..9761908bd0 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -1,8 +1,11 @@
 
-SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
+BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
            file://gccfix.patch;patch=1 \
-           file://noldlibpath.patch;patch=1 \
            file://use-g++-for-linking.patch;patch=1"
+SRC_URI = "${BASE_SRC_URI} \
+           file://noldlibpath.patch;patch=1"
+SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+
 LICENSE = "ICU"
 DEPENDS = "icu-native"
 DEPENDS_virtclass-native = ""
diff --git a/meta/packages/tasks/task-poky-tools.bb b/meta/packages/tasks/task-poky-tools.bb
index cb90718332..4b6d218149 100644
--- a/meta/packages/tasks/task-poky-tools.bb
+++ b/meta/packages/tasks/task-poky-tools.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tools tasks for Poky"
-PR = "r2"
+PR = "r3"
 
 PACKAGES = "\
     task-poky-tools-debug \
@@ -25,6 +25,7 @@ ALLOW_EMPTY = "1"
 KEXECTOOLS ?= "kexec-tools"
 KEXECTOOLS_mips ?= ""
 KEXECTOOLS_mipsel ?= ""
+KEXECTOOLS_powerpc ?= ""
 
 RDEPENDS_task-poky-tools-debug = "\
     gdb \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
new file mode 100644
index 0000000000..6b34032a39
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac       2009-01-15 20:35:31.000000000 +0000
++++ git/configure.ac    2009-01-15 20:35:38.000000000 +0000
+@@ -62,7 +62,6 @@
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
+ AC_PROG_LEX
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index f0fb6e2d1f..7ca88e64e2 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "xkeyboard-config"
 EXTRA_OECONF += "--disable-glx"
 
 PE = "1"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://extra-kmodes.patch;patch=1 \
@@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://hide-cursor-and-ppm-root.patch;patch=1 \
         file://fbdev_xrandr_ioctl.patch;patch=1 \
         file://fix-newer-xorg-headers.patch;patch=1 \
-        file://crosscompile.patch;patch=1"
+        file://crosscompile.patch;patch=1 \
+        file://nodolt.patch;patch=1"
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux
index bea14d5a75..856701d17d 100644
--- a/meta/site/powerpc-linux
+++ b/meta/site/powerpc-linux
@@ -3,3 +3,7 @@ libc_cv_ppc_machine=${libc_cv_ppc_machine=yes}
 libc_cv_mlong_double_128ibm=${libc_cv_mlong_double_128ibm=yes}
 libc_cv_mabi_ibmlongdouble=${libc_cv_mabi_ibmlongdouble=yes}
 libc_cv_mlong_double_128=${libc_cv_mlong_double_128=yes}
+
+# popt
+ac_cv_va_copy=${ac_cv_va_copy=yes}
+ac_cv___va_copy=${ac_cv___va_copy=yes}