[oe-commits] org.oe.dev base.bbclass, package.bbclass: Move package_stagefile function to base.bbclass and add shell version

[rpurdie commit]

base.bbclass, package.bbclass: Move package_stagefile function to base.bbclass and add shell version

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7a7c1dc6e71299e008bacc017b2ef9b0d51be911
ViewMTN: http://monotone.openembedded.org/revision/info/7a7c1dc6e71299e008bacc017b2ef9b0d51be911
Files:
1
classes/base.bbclass
classes/package.bbclass
Diffs:

#
# mt diff -re28e064e57b0e4ee09c9789c204cb705024f2d2a -r7a7c1dc6e71299e008bacc017b2ef9b0d51be911
#
#
#
# patch "classes/base.bbclass"
#  from [088ac64762ad2b24a73f0ca9ba9d96facf15ce47]
#    to [4d25edd67b14eaf17a59f9a302de6db47d325d27]
# 
# patch "classes/package.bbclass"
#  from [68cac3fc2f17c4c604d5f8503ebb11e319c537ac]
#    to [33f942f7d0b56242107236ddb673bc9ee4a06428]
#
============================================================
--- classes/base.bbclass	088ac64762ad2b24a73f0ca9ba9d96facf15ce47
+++ classes/base.bbclass	4d25edd67b14eaf17a59f9a302de6db47d325d27
@@ -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
============================================================
--- classes/package.bbclass	68cac3fc2f17c4c604d5f8503ebb11e319c537ac
+++ classes/package.bbclass	33f942f7d0b56242107236ddb673bc9ee4a06428
@@ -459,18 +459,6 @@ populate_packages[dirs] = "${D}"
 }
 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