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/base.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/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 010b617721..b7459bc996 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -464,6 +464,24 @@ python base_do_mrproper() { | |||
464 | bb.build.exec_func('do_clean', d) | 464 | bb.build.exec_func('do_clean', d) |
465 | } | 465 | } |
466 | 466 | ||
467 | SCENEFUNCS += "base_scenefunction" | ||
468 | |||
469 | python base_do_setscene () { | ||
470 | for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split(): | ||
471 | bb.build.exec_func(f, d) | ||
472 | if not os.path.exists(bb.data.getVar('STAMP', d, 1) + ".do_setscene"): | ||
473 | bb.build.make_stamp("do_setscene", d) | ||
474 | } | ||
475 | do_setscene[selfstamp] = "1" | ||
476 | addtask setscene before do_fetch | ||
477 | |||
478 | python base_scenefunction () { | ||
479 | stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" | ||
480 | if os.path.exists(stamp): | ||
481 | bb.build.exec_func("do_clean", d) | ||
482 | } | ||
483 | |||
484 | |||
467 | addtask fetch | 485 | addtask fetch |
468 | do_fetch[dirs] = "${DL_DIR}" | 486 | do_fetch[dirs] = "${DL_DIR}" |
469 | do_fetch[depends] = "shasum-native:do_populate_staging" | 487 | do_fetch[depends] = "shasum-native:do_populate_staging" |
@@ -604,7 +622,6 @@ def oe_unpack_file(file, data, url = None): | |||
604 | return ret == 0 | 622 | return ret == 0 |
605 | 623 | ||
606 | addtask unpack after do_fetch | 624 | addtask unpack after do_fetch |
607 | do_unpack[cleandirs] = "${WORKDIR}" | ||
608 | do_unpack[dirs] = "${WORKDIR}" | 625 | do_unpack[dirs] = "${WORKDIR}" |
609 | python base_do_unpack() { | 626 | python base_do_unpack() { |
610 | import re, os | 627 | import re, os |
@@ -707,6 +724,7 @@ python base_eventhandler() { | |||
707 | dir = "%s.*" % e.stampPrefix[fn] | 724 | dir = "%s.*" % e.stampPrefix[fn] |
708 | bb.note("Removing stamps: " + dir) | 725 | bb.note("Removing stamps: " + dir) |
709 | os.system('rm -f '+ dir) | 726 | os.system('rm -f '+ dir) |
727 | os.system('touch ' + e.stampPrefix[fn] + '.needclean') | ||
710 | 728 | ||
711 | if not data in e.__dict__: | 729 | if not data in e.__dict__: |
712 | return NotHandled | 730 | return NotHandled |
@@ -972,7 +990,7 @@ inherit patch | |||
972 | # Move to autotools.bbclass? | 990 | # Move to autotools.bbclass? |
973 | inherit siteinfo | 991 | inherit siteinfo |
974 | 992 | ||
975 | EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall | 993 | EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall |
976 | 994 | ||
977 | MIRRORS[func] = "0" | 995 | MIRRORS[func] = "0" |
978 | MIRRORS () { | 996 | MIRRORS () { |