2 files changed, 11 insertions, 5 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c973ce1da4..8ac5846052 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -94,6 +94,8 @@ PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}
 MULTIMACH_ARCH = "${PACKAGE_ARCH}"
 MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
+BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
+BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
 # select proper CPU to get binary locales generated
 QEMU_OPTIONS = ""
@@ -242,7 +244,9 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
 STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
 STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
 
-STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}"
+# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine 
+# specific packages - hack around it for now.
+STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
 STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
 STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
 STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
@@ -252,7 +256,9 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
 STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 
-STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}"
+# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine 
+# specific packages - hack around it for now.
+STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 3025f1e07d..dc01efa420 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -56,9 +56,9 @@ SRCREV_pn-matchbox-themes-extra ?= "1524"
 SRCREV_pn-matchbox-wm-2 ?= "1873"
 SRCREV_pn-matchbox-wm ?= "1524"
 SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-opkg-native ?= "4529"
-SRCREV_pn-opkg-sdk ?= "4529"
-SRCREV_pn-opkg ?= "4529"
+SRCREV_pn-opkg-native ?= "4545"
+SRCREV_pn-opkg-sdk ?= "4545"
+SRCREV_pn-opkg ?= "4545"
 SRCREV_pn-opkg-utils-native ?= "4534"
 SRCREV_pn-opkg-utils ?= "4534"
 SRCREV_pn-oprofileui ?= "194"