diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-02 22:34:50 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-10 13:46:40 +0000 |
| commit | 0c0889223c330b8a3c9e122581805e2c3d9a7bd4 (patch) | |
| tree | 9671947c9b4b491a8dc3c2b9a51029e2f6079d8c | |
| parent | 97c8212d54950b70cd955f94bdd66822ce3f2ba4 (diff) | |
base.bbclass: Add stubs for functions when package-staging isn't active and fix a typo
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | classes/base.bbclass | 14 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 5ae8b6130f..d33ef343c7 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1063,6 +1063,18 @@ SYSROOT_PREPROCESS_FUNCS ?= "" SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" +python populate_staging_prehook () { + return +} + +python populate_staging_posthook () { + return +} + +packagedstaging_fastpath () { + : +} + python do_populate_staging () { # # if do_stage exists, we're legacy. In that case run the do_stage, @@ -1095,7 +1107,7 @@ python do_populate_staging () { #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest)) for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): bb.build.exec_func(f, d) - bb.build.exec_func("packagedstageing_fastpath", d) + bb.build.exec_func("packagedstaging_fastpath", d) lock = bb.utils.lockfile(lockfile) os.system('cp -pPR %s/* /' % (sysrootdest)) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 77faedb9f1..c65efd8b12 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -293,7 +293,7 @@ populate_staging_postamble () { fi } -packagedstageing_fastpath () { +packagedstaging_fastpath () { if [ "$PSTAGING_ACTIVE" = "1" ]; then mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ |