base.bbclass, package.bbclass: Move package_stagefile function to base.bbclass and...

diff --git a/classes/base.bbclass b/classes/base.bbclass
index cfdcaf9..c2ce508 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -368,6 +368,25 @@ oe_libinstall() {
        __runcmd cd "$olddir"
 }
 
+def package_stagefile(file, d):
+    import bb, os
+
+    if bb.data.getVar('PSTAGING_ACTIVE', d, True) == "1":
+        destfile = file.replace(bb.data.getVar("TMPDIR", d, 1), bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1))
+        bb.mkdirhier(os.path.dirname(destfile))
+        #print "%s to %s" % (file, destfile)
+        bb.copyfile(file, destfile)
+
+package_stagefile_shell() {
+       if [ "$PSTAGING_ACTIVE" = "1" ]; then
+               srcfile=$1
+               destfile=`echo $srcfile | sed s#${TMPDIR}#${PSTAGE_TMPDIR_STAGE}#`
+               destdir=`dirname $destfile`
+               mkdir -p $destdir
+               cp -dp $srcfile $destfile
+       fi
+}
+
 oe_machinstall() {
        # Purpose: Install machine dependent files, if available
        #          If not available, check if there is a default

diff --git a/classes/package.bbclass b/classes/package.bbclass
index f9d9193..9fc4df0 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -459,18 +459,6 @@ python populate_packages () {
 }
 populate_packages[dirs] = "${D}"
 
-def package_stagefile(file, d):
-       import bb, os
-
-       pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
-
-       if pstageactive == "1":
-               destfile = file.replace(bb.data.getVar("TMPDIR", d, 1), bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1))
-               bb.mkdirhier(os.path.dirname(destfile))
-               #print "%s to %s" % (file, destfile)
-               bb.copyfile(file, destfile)
-
-
 python emit_pkgdata() {
        from glob import glob