summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-10-01 17:33:11 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-10-01 17:33:11 +0000
commite27c038644fa0e1fe5578b05b768b3f007c19ded (patch)
treef0189d4e62efd4a24796790201fdec31f9cc777a
parent912a9f1abfe7286cff64478bb1a670ff77f1ec56 (diff)
downloadopenembedded-e27c038644fa0e1fe5578b05b768b3f007c19ded.tar.gz
packaged-staging.bbclass: Fix pcross directory recovery
-rw-r--r--classes/packaged-staging.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 65001124e3..c7ff2aef5e 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -225,15 +225,15 @@ if [ ${PN} != "glibc-intermediate" ] ; then
${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