diff options
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 552245c9ee..4d32355f22 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -73,8 +73,10 @@ python () { | |||
73 | stagefunc = bb.data.getVar('do_stage', d, 1).strip() | 73 | stagefunc = bb.data.getVar('do_stage', d, 1).strip() |
74 | if stagefunc == "autotools_stage_all": | 74 | if stagefunc == "autotools_stage_all": |
75 | fastpath = True | 75 | fastpath = True |
76 | if stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": | 76 | elif stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": |
77 | fastpath = True | 77 | fastpath = True |
78 | if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1": | ||
79 | fastpath = False | ||
78 | if fastpath: | 80 | if fastpath: |
79 | #bb.note("Can optimise " + bb.data.getVar('FILE', d, 1)) | 81 | #bb.note("Can optimise " + bb.data.getVar('FILE', d, 1)) |
80 | bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d) | 82 | bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d) |
@@ -325,6 +327,7 @@ autotools_staging_pstage () { | |||
325 | do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" | 327 | do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" |
326 | python do_populate_staging_prepend() { | 328 | python do_populate_staging_prepend() { |
327 | needstamp = bb.data.getVar("PSTAGING_NEEDSTAMP", d, 1) | 329 | needstamp = bb.data.getVar("PSTAGING_NEEDSTAMP", d, 1) |
330 | pstageactive = bb.data.getVar("PSTAGING_ACTIVE", d, True) | ||
328 | lock = bb.data.expand("${STAGING_DIR}/staging.lock", d) | 331 | lock = bb.data.expand("${STAGING_DIR}/staging.lock", d) |
329 | if needstamp == "1": | 332 | if needstamp == "1": |
330 | stamplock = bb.utils.lockfile(lock) | 333 | stamplock = bb.utils.lockfile(lock) |
@@ -335,7 +338,7 @@ python do_populate_staging_append() { | |||
335 | if needstamp == "1": | 338 | if needstamp == "1": |
336 | bb.build.exec_func("populate_staging_postamble", d) | 339 | bb.build.exec_func("populate_staging_postamble", d) |
337 | bb.utils.unlockfile(stamplock) | 340 | bb.utils.unlockfile(stamplock) |
338 | else: | 341 | elif pstageactive == "1": |
339 | stamplock = bb.utils.lockfile(lock) | 342 | stamplock = bb.utils.lockfile(lock) |
340 | bb.build.exec_func("autotools_staging_pstage", d) | 343 | bb.build.exec_func("autotools_staging_pstage", d) |
341 | bb.utils.unlockfile(stamplock) | 344 | bb.utils.unlockfile(stamplock) |