[oe-commits] org.oe.packaged-staging classes/packaged-staging.bbclass: fix thinko in handling cross-dir

[koen commit]

classes/packaged-staging.bbclass: fix thinko in handling cross-dir

Author: koen at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: e8b10c546413ffbab1877f2bc68a573874ab7ab2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e8b10c546413ffbab1877f2bc68a573874ab7ab2
Files:
1
classes/packaged-staging.bbclass
Diffs:

#
# mt diff -r48f9d0d41fc37f0933c6fe68425edc5f286a3ca2 -re8b10c546413ffbab1877f2bc68a573874ab7ab2
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [f6a3b24425ce6c18ce03c284eacb5b2dc04dbcee]
#    to [c1336d583720750e74a485e8a2aefb330712549a]
# 
============================================================
--- classes/packaged-staging.bbclass	f6a3b24425ce6c18ce03c284eacb5b2dc04dbcee
+++ classes/packaged-staging.bbclass	c1336d583720750e74a485e8a2aefb330712549a
@@ -188,7 +188,8 @@ mkdir -p ${DEPLOY_DIR_PSTAGE}
 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" ] ; t
 			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