base.bbclass: Add stubs for functions when package-staging isn't active and fix a...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 5ae8b61..d33ef34 100644 (file)
--- 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 (file)
--- 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/