summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-06-04 11:39:34 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-04 11:39:34 +0000
commit80b78f3f4632a332a9539bacc6fa901fb820662d (patch)
tree849ac2b21593bdf264ba3eafe9af30c90529fe3a
parentf734b47d992dabb0e1f8246b8c7f23f48303191a (diff)
downloadopenembedded-80b78f3f4632a332a9539bacc6fa901fb820662d.tar.gz
classes/packaged-staging.bbclass: minor improvements:
* use PR as well * prefix packages with 'staging-' to avoid confusion with regular packages
-rw-r--r--classes/packaged-staging.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 410c2a4585..829b47b75d 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -40,8 +40,8 @@ do_stage_append() {
mkdir -p ${DEPLOY_DIR_PSTAGE}
mkdir -p ${STAGING_DIR}/CONTROL
-echo "Package: ${PN}" > ${STAGING_DIR}/CONTROL/control
-echo "Version: ${PV}" >> ${STAGING_DIR}/CONTROL/control
+echo "Package: staging-${PN}" > ${STAGING_DIR}/CONTROL/control
+echo "Version: ${PV}-${PR}" >> ${STAGING_DIR}/CONTROL/control
echo "Description: ${DESCRIPTION}" >> ${STAGING_DIR}/CONTROL/control
echo "Section: ${SECTION}" >> ${STAGING_DIR}/CONTROL/control
echo "Priority: Optional" >> ${STAGING_DIR}/CONTROL/control
@@ -71,7 +71,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}/${PN}_${PV}_${PACKAGE_ARCH}.ipk
+${PSTAGE_INSTALL_CMD} ${STAGING_DIR} ${DEPLOY_DIR_PSTAGE}/staging-${PN}_${PV}_${PACKAGE_ARCH}.ipk
}