diff options
| author |   Koen Kooi <koen@openembedded.org> | 2006-08-01 07:33:07 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-08-01 07:33:07 +0000 |
| commit | 8cff2d97f3d4ce16835aa8910e9c383d1730c5bd (patch) | |
| tree | 1bed12ba7c840165b91ed90e62ad756fea99c397 | |
| parent | 3817cb3c7ea29a5665b4079aeb4b1a3b92d6b2d6 (diff) | |
| download | openembedded-8cff2d97f3d4ce16835aa8910e9c383d1730c5bd.tar.gz | |
classes/packaged-staging.bbclass: start adding support for cross/
| -rw-r--r-- | classes/packaged-staging.bbclass | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index cab0923b80..e0e3f2adac 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -49,9 +49,17 @@ do_stage_prepend() { #detect aborted staging attempts if [ -e ${TMPDIR}/moved-staging ]; then oenote "Detected a moved staging, moving it back" - rm -rf ${STAGING_DIR} && ${TMPDIR}/pstage ${STAGING_DIR} && rm ${TMPDIR}/moved-staging + rm -rf ${STAGING_DIR} && mv ${TMPDIR}/pstage ${STAGING_DIR} && rm ${TMPDIR}/moved-staging fi +#detect aborted staging attempts into cross/ +if [ -e ${TMPDIR}/moved-cross ]; then + oenote "Detected a moved cross/, moving it back" + rm -rf ${CROSS_DIR} && mv ${TMPDIR}/pcross ${CROSS_DIR} && rm ${TMPDIR}/moved-cross +fi + + + if [ ! -e ${STAGING_BASEDIR} ]; then mkdir -p ${STAGING_BASEDIR} fi @@ -117,6 +125,7 @@ if [ ${PN} != "glibc-intermediate" ] ; then fi touch ${TMPDIR}/moved-staging + touch ${TMPDIR}/moved-cross mv ${STAGING_DIR} ${TMPDIR}/pstage mkdir -p ${STAGING_BINDIR} @@ -150,6 +159,7 @@ if [ ${PN} != "glibc-intermediate" ] ; then #move back stagingdir so we can install packages mv ${TMPDIR}/pstage ${STAGING_DIR} rm ${TMPDIR}/moved-staging + rm ${TMPDIR}/moved-cross ${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME} else |