From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 2 Nov 2009 22:34:50 +0000 (+0000)
Subject: base.bbclass: Add stubs for functions when package-staging isn't active and fix a... 
X-Git-Tag: Release-2010-05/1~1728^2~19^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c0889223c330b8a3c9e122581805e2c3d9a7bd4;p=openembedded.git

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>
---

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/