2 files changed, 2 insertions, 1 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9eed72ad3f..58d0c206b7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -382,7 +382,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
 DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
 DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
-PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
+PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata"
 
 ##################################################################
 # SDK variables.
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9ff06cc768..733236d6bb 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -8,6 +8,7 @@ MULTILIBS ??= "multilib:lib32"
 
 STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
+PKGDATA_DIR = "${STAGING_DIR}/${MACHINE}/pkgdata"
 
 INHERIT += "multilib_global"