[oe-commits] Richard Purdie : base.bbclass: Add stubs for functions when package-staging isn't active and fix a typo
git version control
git at git.openembedded.org
Tue Nov 10 13:47:25 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0c0889223c330b8a3c9e122581805e2c3d9a7bd4
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0c0889223c330b8a3c9e122581805e2c3d9a7bd4
Author: Richard Purdie <rpurdie at linux.intel.com>
Date: Mon Nov 2 22:34:50 2009 +0000
base.bbclass: Add stubs for functions when package-staging isn't active and fix a typo
Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
---
classes/base.bbclass | 14 +++++++++++++-
classes/packaged-staging.bbclass | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 5ae8b61..d33ef34 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 77faedb..c65efd8 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/
More information about the Openembedded-commits
mailing list