diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
| commit | 0b098d35b319ed6c00f363cb0d4fd447d7fb8d57 (patch) | |
| tree | a830bf983a66688f5648cd83e362c4fea2f48f6b /classes/packaged-staging.bbclass | |
| parent | 06fb90eb31b0b85a5c5c7adf185ce2515c5b1220 (diff) | |
| parent | d3bbd28f22fbd8e9d097081fa128ae18197f36e1 (diff) | |
merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
and '86618f966282489d43b51fbf0ee93b954ac615ae'
Diffstat (limited to 'classes/packaged-staging.bbclass')
| -rw-r--r-- | classes/packaged-staging.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 29ce72d65c..b564136e3f 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -20,6 +20,9 @@ python () { bb.data.setVar("PSTAGING_DISABLED", "1", d) } +# multimachine.bbclass will override this +MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" + export PSTAGING_DISABLED = "0" DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" @@ -225,5 +228,5 @@ python do_package_stage () { bb.utils.unlockfile(lf) } -addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build +addtask package_stage after do_package_write do_populate_staging before do_build |