summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-09-08 11:11:25 +0000
committerKoen Kooi <koen@openembedded.org>2006-09-08 11:11:25 +0000
commit82880c47faca30fb114ccb6712f981f5fe3f52d8 (patch)
treefc0ccb065316e918b525b3166e61830c1fc58301
parentcd863dab5e6ce06891a7e41204f674c115913690 (diff)
downloadopenembedded-82880c47faca30fb114ccb6712f981f5fe3f52d8.tar.gz
classes/packaged-staging.bbclass: fix thinko in handling cross-dir
-rw-r--r--classes/packaged-staging.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 03d88d7aee..65001124e3 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -188,7 +188,8 @@ do_stage_append() {
mkdir -p ${DEPLOY_DIR_PSTAGE}
# list the packages currently installed in staging
-${PSTAGE_LIST_CMD} ${STAGING_BASEDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed_list
+${PSTAGE_LIST_CMD} ${STAGING_BASEDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-staging_list
+${PSTAGE_LIST_CMD} ${CROSSDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-cross_list
if [ ${PN} != "glibc-intermediate" ] ; then
@@ -230,7 +231,7 @@ if [ ${PN} != "glibc-intermediate" ] ; then
rm ${TMPDIR}/moved-cross
fi
- ${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/${PCROSS_PKGNAME}
+ ${PSTAGE_INSTALL_CMD} ${CROSS_DIR} ${DEPLOY_DIR_PSTAGE}/${PCROSS_PKGNAME}
fi # if -e CROSS_DIR
#move back stagingdir so we can install packages