diff options
| author |   Koen Kooi <koen@openembedded.org> | 2006-06-04 11:54:59 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-04 11:54:59 +0000 |
| commit | c2d1918aad35375a62fd8886487667ea3e3745ad (patch) | |
| tree | 1e5f887f97f9a1f090913eb95a607979ec63f64f | |
| parent | 80b78f3f4632a332a9539bacc6fa901fb820662d (diff) | |
| download | openembedded-c2d1918aad35375a62fd8886487667ea3e3745ad.tar.gz | |
classes/packaged-staging.bbclass: use package for do_stage if present
| -rw-r--r-- | classes/packaged-staging.bbclass | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 829b47b75d..932d465cae 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -28,12 +28,21 @@ PSTAGE_INSTALL_CMD = "ipkg-cl install -f ${DEPLOY_DIR_PSTAGE}/ipkg.conf -fo do_stage_prepend() { #move away the staging dir to avoid relocation troubles + +if [ -e ${DEPLOY_DIR_PSTAGE}/staging-${PN}_${PV}-${PR}_${PACKAGE_ARCH}.ipk ]; then + echo "Staging stuff already packaged, using that instead" + ${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/staging-${PN}_${PV}-${PR}_${PACKAGE_ARCH}.ipk + exit 0 +fi + + mv ${STAGING_DIR} ${TMPDIR}/pstage mkdir -p ${STAGING_BINDIR} mkdir -p ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR} -mkdir -p ${STAGING_DATADIR} +mkdir -p ${STAGING_DATADIR}/aclocal + } do_stage_append() { @@ -71,7 +80,7 @@ rm -rf ${STAGING_DIR} #move back stagingdir so we can install packages mv ${TMPDIR}/pstage ${STAGING_DIR} -${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/staging-${PN}_${PV}_${PACKAGE_ARCH}.ipk +${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/staging-${PN}_${PV}-${PR}_${PACKAGE_ARCH}.ipk } |