diff options
author | Richard Purdie <richard@openedhand.com> | 2008-04-27 10:48:16 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-04-27 10:48:16 +0000 |
commit | 192e4fb821f7158fdeeee129f8c3d8f27dd2ea1a (patch) | |
tree | efc5abe7e8aa319d20012ee7235db4787313d0c7 /meta/classes/packaged-staging.bbclass | |
parent | 04e667e2e1f495b8563a28a83d49b4bd0c493963 (diff) | |
download | poky-192e4fb821f7158fdeeee129f8c3d8f27dd2ea1a.tar.gz |
base.bbclass: Add setscene task to handle preparing the work area at the start of a given task, fixing the handling of the rebuild task. This task removes the need for do_prepackaged_stage in packaged-staging.bbclass.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4351 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/packaged-staging.bbclass')
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 1df2a2c9f0..e6f2f3b53e 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -123,7 +123,9 @@ staging_helper () { | |||
123 | 123 | ||
124 | PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging" | 124 | PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging" |
125 | 125 | ||
126 | python do_prepackaged_stage () { | 126 | SCENEFUNCS += "packagestage_scenefunc" |
127 | |||
128 | python packagestage_scenefunc () { | ||
127 | import os | 129 | import os |
128 | 130 | ||
129 | if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": | 131 | if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": |
@@ -156,17 +158,10 @@ python do_prepackaged_stage () { | |||
156 | if ret != 0: | 158 | if ret != 0: |
157 | bb.note("Failure installing prestage package") | 159 | bb.note("Failure installing prestage package") |
158 | 160 | ||
159 | #bb.build.make_stamp("do_prepackaged_stage", d) | ||
160 | #for task in bb.data.getVar("PSTAGE_TASKS_COVERED", d, 1).split(): | ||
161 | # bb.build.make_stamp("do_" + task, d) | ||
162 | bb.build.make_stamp("do_stage_package_populated", d) | 161 | bb.build.make_stamp("do_stage_package_populated", d) |
163 | 162 | ||
164 | else: | ||
165 | bb.build.make_stamp("do_prepackaged_stage", d) | ||
166 | } | 163 | } |
167 | do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" | 164 | packagestage_scenefunc[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" |
168 | do_prepackaged_stage[selfstamp] = "1" | ||
169 | addtask prepackaged_stage before do_fetch | ||
170 | 165 | ||
171 | addhandler packagedstage_stampfixing_eventhandler | 166 | addhandler packagedstage_stampfixing_eventhandler |
172 | python packagedstage_stampfixing_eventhandler() { | 167 | python packagedstage_stampfixing_eventhandler() { |