mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4351 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-04-27 10:48:16 +00:00
parent 04e667e2e1
commit 192e4fb821
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/classes/base.bbclass
View File

@@ -464,6 +464,24 @@ python base_do_mrproper() {
bb.build.exec_func('do_clean', d)
}
SCENEFUNCS += "base_scenefunction"
python base_do_setscene () {
for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split():
bb.build.exec_func(f, d)
if not os.path.exists(bb.data.getVar('STAMP', d, 1) + ".do_setscene"):
bb.build.make_stamp("do_setscene", d)
}
do_setscene[selfstamp] = "1"
addtask setscene before do_fetch
python base_scenefunction () {
stamp = bb.data.getVar('STAMP', d, 1) + ".needclean"
if os.path.exists(stamp):
bb.build.exec_func("do_clean", d)
}
addtask fetch
do_fetch[dirs] = "${DL_DIR}"
do_fetch[depends] = "shasum-native:do_populate_staging"
@@ -604,7 +622,6 @@ def oe_unpack_file(file, data, url = None):
return ret == 0
addtask unpack after do_fetch
do_unpack[cleandirs] = "${WORKDIR}"
do_unpack[dirs] = "${WORKDIR}"
python base_do_unpack() {
import re, os
@@ -707,6 +724,7 @@ python base_eventhandler() {
dir = "%s.*" % e.stampPrefix[fn]
bb.note("Removing stamps: " + dir)
os.system('rm -f '+ dir)
os.system('touch ' + e.stampPrefix[fn] + '.needclean')
if not data in e.__dict__:
return NotHandled
@@ -972,7 +990,7 @@ inherit patch
# Move to autotools.bbclass?
inherit siteinfo
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
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
MIRRORS[func] = "0"
MIRRORS () {

13
meta/classes/packaged-staging.bbclass
View File

@@ -123,7 +123,9 @@ staging_helper () {
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"
python do_prepackaged_stage () {
SCENEFUNCS += "packagestage_scenefunc"
python packagestage_scenefunc () {
import os
if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0":
@@ -156,17 +158,10 @@ python do_prepackaged_stage () {
if ret != 0:
bb.note("Failure installing prestage package")
#bb.build.make_stamp("do_prepackaged_stage", d)
#for task in bb.data.getVar("PSTAGE_TASKS_COVERED", d, 1).split():
# bb.build.make_stamp("do_" + task, d)
bb.build.make_stamp("do_stage_package_populated", d)
else:
bb.build.make_stamp("do_prepackaged_stage", d)
}
do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
do_prepackaged_stage[selfstamp] = "1"
addtask prepackaged_stage before do_fetch
packagestage_scenefunc[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
addhandler packagedstage_stampfixing_eventhandler
python packagedstage_stampfixing_eventhandler() {