[oe-commits] org.oe.packaged-staging packaged-staging.bbclass: Fix pcross directory recovery

[rpurdie commit]

packaged-staging.bbclass: Fix pcross directory recovery

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

#
# mt diff -rce39bd28bd3b560789a3bac214b6a55fdaebf15c -r4ca7ba9c01dae6735453e8d47fa2d585b98c51b0
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [c1336d583720750e74a485e8a2aefb330712549a]
#    to [deac2e8db37baf61e012f3677a30573e76d949e5]
# 
============================================================
--- classes/packaged-staging.bbclass	c1336d583720750e74a485e8a2aefb330712549a
+++ classes/packaged-staging.bbclass	deac2e8db37baf61e012f3677a30573e76d949e5
@@ -225,15 +225,15 @@ if [ ${PN} != "glibc-intermediate" ] ; t
 	
 		${PSTAGE_BUILD_CMD} ${CROSS_DIR} ${DEPLOY_DIR_PSTAGE}
 
-		if [ -e ${TMPDIR}/pcross ] ; then  
-			rm -rf ${CROSS_DIR}
-		        mv ${TMPDIR}/pcross ${CROSS_DIR}
-			rm ${TMPDIR}/moved-cross
-		fi
-
 		${PSTAGE_INSTALL_CMD} ${CROSS_DIR}  ${DEPLOY_DIR_PSTAGE}/${PCROSS_PKGNAME}
 	fi # if -e CROSS_DIR
 
+	if [ -e ${TMPDIR}/moved-cross ] ; then  
+		rm -rf ${CROSS_DIR}
+	        mv ${TMPDIR}/pcross ${CROSS_DIR}
+		rm ${TMPDIR}/moved-cross
+	fi
+
 	#move back stagingdir so we can install packages   
 	mv ${TMPDIR}/pstage ${STAGING_DIR}
 	rm ${TMPDIR}/moved-staging