From e3e0ec29e303e833aef71d1653d6743257433182 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 14 Mar 2008 16:26:33 +0000
Subject: base.bbclass: Add .la file brute force sed enhancement from poky

---
 classes/base.bbclass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 615d02d07e..cfdcaf9c3e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -325,6 +325,7 @@ oe_libinstall() {
 			__runcmd rm -f $destpath/$libname.la
 			__runcmd sed -e 's/^installed=yes$/installed=no/' \
 				     -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+				     -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
 				     $dotlai >$destpath/$libname.la
 		else
 			__runcmd install -m 0644 $dotlai $destpath/$libname.la
-- 
cgit v1.2.3


From 53d4e93052b2cbefe1e2175f1183f8821f3109f5 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 14 Mar 2008 16:28:12 +0000
Subject: base.bbclass, package.bbclass: Move package_stagefile function to
 base.bbclass and add shell version

---
 classes/base.bbclass | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index cfdcaf9c3e..c2ce508538 100644
--- 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
-- 
cgit v1.2.3