diff options
Diffstat (limited to 'meta/classes/packaged-staging.bbclass')
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index a04c956c80..cda16d1cc5 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -128,7 +128,6 @@ def pstage_cleanpackage(pkgname, d): | |||
128 | else: | 128 | else: |
129 | bb.note("No. Manually removing any installed files") | 129 | bb.note("No. Manually removing any installed files") |
130 | pstage_manualclean("sysroots", "STAGING_DIR", d) | 130 | pstage_manualclean("sysroots", "STAGING_DIR", d) |
131 | pstage_manualclean("cross", "CROSS_DIR", d) | ||
132 | pstage_manualclean("deploy", "DEPLOY_DIR", d) | 131 | pstage_manualclean("deploy", "DEPLOY_DIR", d) |
133 | 132 | ||
134 | bb.utils.unlockfile(lf) | 133 | bb.utils.unlockfile(lf) |
@@ -297,7 +296,6 @@ python packagedstage_stampfixing_eventhandler() { | |||
297 | populate_sysroot_preamble () { | 296 | populate_sysroot_preamble () { |
298 | if [ "$PSTAGING_ACTIVE" = "1" ]; then | 297 | if [ "$PSTAGING_ACTIVE" = "1" ]; then |
299 | stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u || true | 298 | stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u || true |
300 | stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u || true | ||
301 | fi | 299 | fi |
302 | } | 300 | } |
303 | 301 | ||
@@ -313,7 +311,6 @@ populate_sysroot_postamble () { | |||
313 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then | 311 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then |
314 | exit $exitcode | 312 | exit $exitcode |
315 | fi | 313 | fi |
316 | stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH} | ||
317 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then | 314 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then |
318 | exit $exitcode | 315 | exit $exitcode |
319 | fi | 316 | fi |
@@ -324,9 +321,7 @@ populate_sysroot_postamble () { | |||
324 | packagedstaging_fastpath () { | 321 | packagedstaging_fastpath () { |
325 | if [ "$PSTAGING_ACTIVE" = "1" ]; then | 322 | if [ "$PSTAGING_ACTIVE" = "1" ]; then |
326 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/ | 323 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/ |
327 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ | ||
328 | cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true | 324 | cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true |
329 | cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true | ||
330 | fi | 325 | fi |
331 | } | 326 | } |
332 | 327 | ||