diff options
Diffstat (limited to 'meta/classes/packaged-staging.bbclass')
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 82a4450bc3..c572daedaf 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -52,7 +52,7 @@ python () { | |||
52 | # as inactive. | 52 | # as inactive. |
53 | if pstage_allowed: | 53 | if pstage_allowed: |
54 | deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" | 54 | deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" |
55 | deps += " stagemanager-native:do_populate_staging" | 55 | deps += " stagemanager-native:do_populate_sysroot" |
56 | bb.data.setVarFlag('do_setscene', 'depends', deps, d) | 56 | bb.data.setVarFlag('do_setscene', 'depends', deps, d) |
57 | 57 | ||
58 | policy = bb.data.getVar("BB_STAMP_POLICY", d, True) | 58 | policy = bb.data.getVar("BB_STAMP_POLICY", d, True) |
@@ -157,7 +157,7 @@ staging_helper () { | |||
157 | fi | 157 | fi |
158 | } | 158 | } |
159 | 159 | ||
160 | 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" | 160 | PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging" |
161 | 161 | ||
162 | SCENEFUNCS += "packagestage_scenefunc" | 162 | SCENEFUNCS += "packagestage_scenefunc" |
163 | 163 | ||
@@ -259,21 +259,21 @@ python packagedstage_stampfixing_eventhandler() { | |||
259 | return NotHandled | 259 | return NotHandled |
260 | } | 260 | } |
261 | 261 | ||
262 | populate_staging_preamble () { | 262 | populate_sysroot_preamble () { |
263 | if [ "$PSTAGING_ACTIVE" = "1" ]; then | 263 | if [ "$PSTAGING_ACTIVE" = "1" ]; then |
264 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true | 264 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true |
265 | stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true | 265 | stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true |
266 | fi | 266 | fi |
267 | } | 267 | } |
268 | 268 | ||
269 | populate_staging_postamble () { | 269 | populate_sysroot_postamble () { |
270 | if [ "$PSTAGING_ACTIVE" = "1" ]; then | 270 | if [ "$PSTAGING_ACTIVE" = "1" ]; then |
271 | # list the packages currently installed in staging | 271 | # list the packages currently installed in staging |
272 | # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list | 272 | # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list |
273 | 273 | ||
274 | # exitcode == 5 is ok, it means the files change | 274 | # exitcode == 5 is ok, it means the files change |
275 | set +e | 275 | set +e |
276 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging | 276 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/sysroots |
277 | exitcode=$? | 277 | exitcode=$? |
278 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then | 278 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then |
279 | exit $exitcode | 279 | exit $exitcode |
@@ -288,20 +288,20 @@ populate_staging_postamble () { | |||
288 | 288 | ||
289 | packagedstaging_fastpath () { | 289 | packagedstaging_fastpath () { |
290 | if [ "$PSTAGING_ACTIVE" = "1" ]; then | 290 | if [ "$PSTAGING_ACTIVE" = "1" ]; then |
291 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ | 291 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/ |
292 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ | 292 | mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ |
293 | cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true | 293 | cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true |
294 | cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true | 294 | cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true |
295 | fi | 295 | fi |
296 | } | 296 | } |
297 | 297 | ||
298 | do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" | 298 | do_populate_sysroot[dirs] =+ "${DEPLOY_DIR_PSTAGE}" |
299 | python populate_staging_prehook() { | 299 | python populate_sysroot_prehook() { |
300 | bb.build.exec_func("populate_staging_preamble", d) | 300 | bb.build.exec_func("populate_sysroot_preamble", d) |
301 | } | 301 | } |
302 | 302 | ||
303 | python populate_staging_posthook() { | 303 | python populate_sysroot_posthook() { |
304 | bb.build.exec_func("populate_staging_postamble", d) | 304 | bb.build.exec_func("populate_sysroot_postamble", d) |
305 | } | 305 | } |
306 | 306 | ||
307 | 307 | ||
@@ -444,9 +444,9 @@ python do_package_stage () { | |||
444 | } | 444 | } |
445 | 445 | ||
446 | # | 446 | # |
447 | # Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging | 447 | # Note an assumption here is that do_deploy runs before do_package_write/do_populate_sysroot |
448 | # | 448 | # |
449 | addtask package_stage after do_package_write do_populate_staging before do_build | 449 | addtask package_stage after do_package_write do_populate_sysroot before do_build |
450 | 450 | ||
451 | do_package_stage_all () { | 451 | do_package_stage_all () { |
452 | : | 452 | : |